home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1995-08-31 | 73.3 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 1%
| dexvert
| Emacs Compiled Lisp (other/emacsCompiledLisp)
| magic
| Unsupported |
| 1%
| dexvert
| Combustion 2 Particle Library (other/combustion2ParticleLibrary)
| ext
| Unsupported |
| 100%
| file
| Emacs/XEmacs v19 byte-compiled Lisp data
| default
| |
| 99%
| file
| data
| default
| |
| 55%
| TrID
| Emacs/XEmacs byte-compiled Lisp (generic)
| default
| |
| 44%
| TrID
| Summation Document Image Information Load File
| default (weak)
| |
| 100%
| xdgMime
| text/x-emacs-lisp
| default (weak)
|
|
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 63 74 68 6f 6d 70 40 |piled by| cthomp@|
|00000020| 77 69 6c 6c 6f 77 2e 63 | 73 2e 75 69 75 63 2e 65 |willow.c|s.uiuc.e|
|00000030| 64 75 20 6f 6e 20 54 68 | 75 20 41 75 67 20 33 31 |du on Th|u Aug 31|
|00000040| 20 31 34 3a 32 30 3a 32 | 35 20 31 39 39 35 0a 3b | 14:20:2|5 1995.;|
|00000050| 3b 3b 20 66 72 6f 6d 20 | 66 69 6c 65 20 2f 65 78 |;; from |file /ex|
|00000060| 70 6f 72 74 2f 77 69 6c | 6c 6f 77 33 2f 78 65 6d |port/wil|low3/xem|
|00000070| 61 63 73 2d 31 39 2e 31 | 33 2d 72 65 6c 65 61 73 |acs-19.1|3-releas|
|00000080| 65 2f 65 64 69 74 6f 72 | 2f 6c 69 73 70 2f 65 64 |e/editor|/lisp/ed|
|00000090| 69 66 66 2f 65 64 69 66 | 66 2d 75 74 69 6c 2e 65 |iff/edif|f-util.e|
|000000a0| 6c 0a 3b 3b 3b 20 65 6d | 61 63 73 20 76 65 72 73 |l.;;; em|acs vers|
|000000b0| 69 6f 6e 20 31 39 2e 31 | 33 20 58 45 6d 61 63 73 |ion 19.1|3 XEmacs|
|000000c0| 20 4c 75 63 69 64 2e 0a | 3b 3b 3b 20 62 79 74 65 | Lucid..|;;; byte|
|000000d0| 63 6f 6d 70 20 76 65 72 | 73 69 6f 6e 20 32 2e 32 |comp ver|sion 2.2|
|000000e0| 35 3b 20 31 2d 53 65 70 | 2d 39 34 2e 0a 3b 3b 3b |5; 1-Sep|-94..;;;|
|000000f0| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000100| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000110| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000120| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000130| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 38 2e 0a |st in Em|acs 18..|
|00000140| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000150| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000160| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000170| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|00000180| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|00000190| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. | (str|
|000001a0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001b0| 76 65 72 73 69 6f 6e 20 | 22 31 39 22 29 29 29 0a |version |"19"))).|
|000001c0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 54 68 69 73 | (err|or "This|
|000001d0| 20 66 69 6c 65 20 77 61 | 73 20 63 6f 6d 70 69 6c | file wa|s compil|
|000001e0| 65 64 20 66 6f 72 20 45 | 6d 61 63 73 20 31 39 2e |ed for E|macs 19.|
|000001f0| 22 29 29 0a 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |"))..(by|te-code |
|00000200| 22 c0 c1 21 88 c0 c2 21 | 87 22 20 5b 72 65 71 75 |"..!...!|." [requ|
|00000210| 69 72 65 20 65 64 69 66 | 66 2d 69 6e 69 74 20 65 |ire edif|f-init e|
|00000220| 64 69 66 66 2d 6d 65 74 | 61 5d 20 32 29 0a 28 66 |diff-met|a] 2).(f|
|00000230| 73 65 74 20 27 65 64 69 | 66 66 2d 6d 6f 64 65 20 |set 'edi|ff-mode |
|00000240| 23 5b 6e 69 6c 20 22 c0 | 20 88 c1 12 c3 14 c5 c6 |#[nil ".| .......|
|00000250| 21 87 22 20 5b 6b 69 6c | 6c 2d 61 6c 6c 2d 6c 6f |!." [kil|l-all-lo|
|00000260| 63 61 6c 2d 76 61 72 69 | 61 62 6c 65 73 20 65 64 |cal-vari|ables ed|
|00000270| 69 66 66 2d 6d 6f 64 65 | 20 6d 61 6a 6f 72 2d 6d |iff-mode| major-m|
|00000280| 6f 64 65 20 22 45 64 69 | 66 66 22 20 6d 6f 64 65 |ode "Edi|ff" mode|
|00000290| 2d 6e 61 6d 65 20 72 75 | 6e 2d 68 6f 6f 6b 73 20 |-name ru|n-hooks |
|000002a0| 65 64 69 66 66 2d 6d 6f | 64 65 2d 68 6f 6f 6b 73 |ediff-mo|de-hooks|
|000002b0| 5d 20 32 20 22 5c 0a 45 | 64 69 66 66 20 6d 6f 64 |] 2 "\.E|diff mod|
|000002c0| 65 20 63 6f 6e 74 72 6f | 6c 73 20 61 6c 6c 20 6f |e contro|ls all o|
|000002d0| 70 65 72 61 74 69 6f 6e | 73 20 69 6e 20 61 20 73 |peration|s in a s|
|000002e0| 69 6e 67 6c 65 20 45 64 | 69 66 66 20 73 65 73 73 |ingle Ed|iff sess|
|000002f0| 69 6f 6e 2e 0a 54 68 69 | 73 20 6d 6f 64 65 20 69 |ion..Thi|s mode i|
|00000300| 73 20 65 6e 74 65 72 65 | 64 20 74 68 72 6f 75 67 |s entere|d throug|
|00000310| 68 20 6f 6e 65 20 6f 66 | 20 74 68 65 20 66 6f 6c |h one of| the fol|
|00000320| 6c 6f 77 69 6e 67 20 63 | 6f 6d 6d 61 6e 64 73 3a |lowing c|ommands:|
|00000330| 0a 09 60 65 64 69 66 66 | 27 0a 09 60 65 64 69 66 |..`ediff|'..`edif|
|00000340| 66 2d 66 69 6c 65 73 27 | 0a 09 60 65 64 69 66 66 |f-files'|..`ediff|
|00000350| 2d 62 75 66 66 65 72 73 | 27 0a 09 60 65 64 69 66 |-buffers|'..`edif|
|00000360| 66 33 27 0a 09 60 65 64 | 69 66 66 2d 66 69 6c 65 |f3'..`ed|iff-file|
|00000370| 73 33 27 0a 09 60 65 64 | 69 66 66 2d 62 75 66 66 |s3'..`ed|iff-buff|
|00000380| 65 72 73 33 27 0a 09 60 | 65 64 69 66 66 2d 6d 65 |ers3'..`|ediff-me|
|00000390| 72 67 65 27 0a 09 60 65 | 64 69 66 66 2d 6d 65 72 |rge'..`e|diff-mer|
|000003a0| 67 65 2d 66 69 6c 65 73 | 27 0a 09 60 65 64 69 66 |ge-files|'..`edif|
|000003b0| 66 2d 6d 65 72 67 65 2d | 66 69 6c 65 73 2d 77 69 |f-merge-|files-wi|
|000003c0| 74 68 2d 61 6e 63 65 73 | 74 6f 72 27 0a 09 60 65 |th-ances|tor'..`e|
|000003d0| 64 69 66 66 2d 6d 65 72 | 67 65 2d 62 75 66 66 65 |diff-mer|ge-buffe|
|000003e0| 72 73 27 0a 09 60 65 64 | 69 66 66 2d 6d 65 72 67 |rs'..`ed|iff-merg|
|000003f0| 65 2d 62 75 66 66 65 72 | 73 2d 77 69 74 68 2d 61 |e-buffer|s-with-a|
|00000400| 6e 63 65 73 74 6f 72 27 | 0a 09 60 65 64 69 66 66 |ncestor'|..`ediff|
|00000410| 2d 6d 65 72 67 65 2d 72 | 65 76 69 73 69 6f 6e 73 |-merge-r|evisions|
|00000420| 27 0a 09 60 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |'..`edif|f-merge-|
|00000430| 72 65 76 69 73 69 6f 6e | 73 2d 77 69 74 68 2d 61 |revision|s-with-a|
|00000440| 6e 63 65 73 74 6f 72 27 | 0a 09 60 65 64 69 66 66 |ncestor'|..`ediff|
|00000450| 2d 77 69 6e 64 6f 77 73 | 2d 77 6f 72 64 77 69 73 |-windows|-wordwis|
|00000460| 65 27 0a 09 60 65 64 69 | 66 66 2d 77 69 6e 64 6f |e'..`edi|ff-windo|
|00000470| 77 73 2d 6c 69 6e 65 77 | 69 73 65 27 0a 09 60 65 |ws-linew|ise'..`e|
|00000480| 64 69 66 66 2d 72 65 67 | 69 6f 6e 73 2d 77 6f 72 |diff-reg|ions-wor|
|00000490| 64 77 69 73 65 27 0a 09 | 60 65 64 69 66 66 2d 72 |dwise'..|`ediff-r|
|000004a0| 65 67 69 6f 6e 73 2d 6c | 69 6e 65 77 69 73 65 27 |egions-l|inewise'|
|000004b0| 0a 09 60 65 70 61 74 63 | 68 27 0a 09 60 65 64 69 |..`epatc|h'..`edi|
|000004c0| 66 66 2d 70 61 74 63 68 | 2d 66 69 6c 65 27 0a 09 |ff-patch|-file'..|
|000004d0| 60 65 64 69 66 66 2d 70 | 61 74 63 68 2d 62 75 66 |`ediff-p|atch-buf|
|000004e0| 66 65 72 27 0a 09 60 65 | 70 61 74 63 68 2d 62 75 |fer'..`e|patch-bu|
|000004f0| 66 66 65 72 27 0a 09 60 | 65 64 69 66 66 2d 72 65 |ffer'..`|ediff-re|
|00000500| 76 69 73 69 6f 6e 27 0a | 0a 43 6f 6d 6d 61 6e 64 |vision'.|.Command|
|00000510| 73 3a 0a 5c 5c 7b 65 64 | 69 66 66 2d 6d 6f 64 65 |s:.\\{ed|iff-mode|
|00000520| 2d 6d 61 70 7d 22 5d 29 | 0a 28 66 73 65 74 20 27 |-map}"])|.(fset '|
|00000530| 65 64 69 66 66 2d 76 65 | 72 73 69 6f 6e 20 23 5b |ediff-ve|rsion #[|
|00000540| 6e 69 6c 20 22 74 ab 85 | c0 c1 20 21 87 c2 c3 09 |nil "t..|.. !....|
|00000550| 0c 23 87 22 20 5b 6d 65 | 73 73 61 67 65 20 65 64 |.#." [me|ssage ed|
|00000560| 69 66 66 2d 76 65 72 73 | 69 6f 6e 20 66 6f 72 6d |iff-vers|ion form|
|00000570| 61 74 20 22 45 64 69 66 | 66 20 25 73 20 6f 66 20 |at "Edif|f %s of |
|00000580| 25 73 22 20 65 64 69 66 | 66 2d 64 61 74 65 5d 20 |%s" edif|f-date] |
|00000590| 34 20 22 5c 0a 52 65 74 | 75 72 6e 20 73 74 72 69 |4 "\.Ret|urn stri|
|000005a0| 6e 67 20 64 65 73 63 72 | 69 62 69 6e 67 20 74 68 |ng descr|ibing th|
|000005b0| 65 20 76 65 72 73 69 6f | 6e 20 6f 66 20 45 64 69 |e versio|n of Edi|
|000005c0| 66 66 2e 0a 57 68 65 6e | 20 63 61 6c 6c 65 64 20 |ff..When| called |
|000005d0| 69 6e 74 65 72 61 63 74 | 69 76 65 6c 79 2c 20 64 |interact|ively, d|
|000005e0| 69 73 70 6c 61 79 73 20 | 74 68 65 20 76 65 72 73 |isplays |the vers|
|000005f0| 69 6f 6e 2e 22 20 6e 69 | 6c 5d 29 0a 28 62 79 74 |ion." ni|l]).(byt|
|00000600| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c0 c2 21 87 |e-code "|..!...!.|
|00000610| 22 20 5b 72 65 71 75 69 | 72 65 20 65 64 69 66 66 |" [requi|re ediff|
|00000620| 2d 64 69 66 66 20 65 64 | 69 66 66 2d 6d 65 72 67 |-diff ed|iff-merg|
|00000630| 5d 20 32 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |] 2).(de|fvar edi|
|00000640| 66 66 2d 6d 6f 64 65 2d | 6d 61 70 20 6e 69 6c 20 |ff-mode-|map nil |
|00000650| 22 5c 0a 4c 6f 63 61 6c | 20 6b 65 79 6d 61 70 20 |"\.Local| keymap |
|00000660| 75 73 65 64 20 69 6e 20 | 45 64 69 66 66 20 6d 6f |used in |Ediff mo|
|00000670| 64 65 2e 0a 54 68 69 73 | 20 69 73 20 6c 6f 63 61 |de..This| is loca|
|00000680| 6c 20 74 6f 20 65 61 63 | 68 20 45 64 69 66 66 20 |l to eac|h Ediff |
|00000690| 43 6f 6e 74 72 6f 6c 20 | 50 61 6e 65 6c 2c 20 73 |Control |Panel, s|
|000006a0| 6f 20 74 68 65 79 20 6d | 61 79 20 76 61 72 79 20 |o they m|ay vary |
|000006b0| 66 72 6f 6d 20 69 6e 76 | 6f 63 61 74 69 6f 6e 0a |from inv|ocation.|
|000006c0| 74 6f 20 69 6e 76 6f 63 | 61 74 69 6f 6e 2e 22 29 |to invoc|ation.")|
|000006d0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|000006e0| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|000006f0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00000700| 6f 63 61 6c 20 65 64 69 | 66 66 2d 6d 6f 64 65 2d |ocal edi|ff-mode-|
|00000710| 6d 61 70 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |map put |permanen|
|00000720| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 28 66 |t-local |t] 4).(f|
|00000730| 73 65 74 20 27 65 64 69 | 66 66 2d 73 65 74 2d 6b |set 'edi|ff-set-k|
|00000740| 65 79 73 20 23 5b 6e 69 | 6c 20 22 08 ac 83 c1 20 |eys #[ni|l ".... |
|00000750| 88 c2 08 21 87 22 20 5b | 65 64 69 66 66 2d 6d 6f |...!." [|ediff-mo|
|00000760| 64 65 2d 6d 61 70 20 65 | 64 69 66 66 2d 73 65 74 |de-map e|diff-set|
|00000770| 75 70 2d 6b 65 79 6d 61 | 70 20 75 73 65 2d 6c 6f |up-keyma|p use-lo|
|00000780| 63 61 6c 2d 6d 61 70 5d | 20 32 20 22 5c 0a 53 65 |cal-map]| 2 "\.Se|
|00000790| 74 20 75 70 20 45 64 69 | 66 66 20 6b 65 79 6d 61 |t up Edi|ff keyma|
|000007a0| 70 2c 20 69 66 20 6e 65 | 63 65 73 73 61 72 79 2e |p, if ne|cessary.|
|000007b0| 22 5d 29 0a 28 66 73 65 | 74 20 27 65 64 69 66 66 |"]).(fse|t 'ediff|
|000007c0| 2d 72 65 6c 6f 61 64 2d | 6b 65 79 6d 61 70 20 23 |-reload-|keymap #|
|000007d0| 5b 6e 69 6c 20 22 c0 11 | c2 20 87 22 20 5b 6e 69 |[nil "..|. ." [ni|
|000007e0| 6c 20 65 64 69 66 66 2d | 6d 6f 64 65 2d 6d 61 70 |l ediff-|mode-map|
|000007f0| 20 65 64 69 66 66 2d 73 | 65 74 2d 6b 65 79 73 5d | ediff-s|et-keys]|
|00000800| 20 31 20 6e 69 6c 20 6e | 69 6c 5d 29 0a 28 66 73 | 1 nil n|il]).(fs|
|00000810| 65 74 20 27 65 64 69 66 | 66 2d 73 65 74 75 70 2d |et 'edif|f-setup-|
|00000820| 6b 65 79 6d 61 70 20 23 | 5b 6e 69 6c 20 22 c0 20 |keymap #|[nil ". |
|00000830| 11 c2 09 21 88 c3 09 c4 | c5 23 88 c3 09 c6 c5 23 |...!....|.#.....#|
|00000840| 88 c3 09 c7 c5 23 88 c3 | 09 c8 c5 23 88 c3 09 c9 |.....#..|...#....|
|00000850| 0e 5c 6e ad 81 c5 23 88 | c3 09 cb cc 23 88 c3 09 |.\n...#.|....#...|
|00000860| cd cc 23 88 c3 09 ce cf | 23 88 c3 09 d0 d1 23 88 |..#.....|#.....#.|
|00000870| c3 09 d2 d3 23 88 c3 09 | d4 d3 23 88 c3 09 d5 d6 |....#...|..#.....|
|00000880| 23 88 c3 09 d7 d8 23 88 | c3 09 d9 da 23 88 c3 09 |#.....#.|....#...|
|00000890| db dc 23 88 c3 09 dd de | 23 88 c3 09 df e0 23 88 |..#.....|#.....#.|
|000008a0| 0e 21 ac 86 c3 09 e2 e3 | 23 88 0e 24 ab 86 c3 09 |.!......|#..$....|
|000008b0| e5 e6 23 88 c3 09 e7 e8 | 23 88 c3 09 e9 ea 23 88 |..#.....|#.....#.|
|000008c0| c3 09 eb ea 23 88 c3 09 | ec ea 23 88 c3 09 ed ea |....#...|..#.....|
|000008d0| 23 88 c3 09 ee ea 23 88 | c3 09 ef f0 23 88 c3 09 |#.....#.|....#...|
|000008e0| f1 f0 23 88 c3 09 f2 f3 | 23 88 c3 09 f4 f5 23 88 |..#.....|#.....#.|
|000008f0| c3 09 f6 f7 23 88 c3 09 | f8 f9 23 88 c3 09 fa fb |....#...|..#.....|
|00000900| 23 88 c3 09 fc fd 23 88 | 0e 21 ac 86 c3 09 fe ff |#.....#.|.!......|
|00000910| 23 88 c3 09 81 40 00 d1 | 23 88 c3 09 81 41 00 d1 |#....@..|#....A..|
|00000920| 23 88 c3 09 81 42 00 d1 | 23 88 0e 43 ab d3 c3 09 |#....B..|#..C....|
|00000930| 81 44 00 81 45 00 23 88 | c3 09 81 40 00 81 46 00 |.D..E.#.|...@..F.|
|00000940| 23 88 c3 09 81 41 00 81 | 47 00 23 88 c3 09 81 42 |#....A..|G.#....B|
|00000950| 00 81 48 00 23 88 c3 09 | 81 49 00 81 4a 00 23 88 |..H.#...|.I..J.#.|
|00000960| c3 09 81 4b 00 81 4c 00 | 23 88 c3 09 81 4d 00 81 |...K..L.|#....M..|
|00000970| 4e 00 23 88 c3 09 81 4f | 00 81 50 00 23 88 82 ec |N.#....O|..P.#...|
|00000980| 01 0e 51 ab ee c3 09 81 | 52 00 81 53 00 23 88 c3 |..Q.....|R..S.#..|
|00000990| 09 81 54 00 81 53 00 23 | 88 c3 09 81 55 00 81 53 |..T..S.#|....U..S|
|000009a0| 00 23 88 c3 09 81 56 00 | 81 53 00 23 88 c3 09 81 |.#....V.|.S.#....|
|000009b0| 57 00 d1 23 88 c3 09 81 | 58 00 81 53 00 23 88 c3 |W..#....|X..S.#..|
|000009c0| 09 81 59 00 81 53 00 23 | 88 c3 09 81 5a 00 81 5b |..Y..S.#|....Z..[|
|000009d0| 00 23 88 c3 09 81 5c 5c | 00 81 5b 00 23 88 c3 09 |.#....\\|..[.#...|
|000009e0| 81 5d 00 81 5b 00 23 88 | c3 09 81 5e 00 81 5f 00 |.]..[.#.|...^.._.|
|000009f0| 23 88 aa a8 c3 09 81 40 | 00 81 60 00 23 88 c3 09 |#......@|..`.#...|
|00000a00| 81 41 00 81 61 00 23 88 | c3 09 81 5a 00 81 5b 00 |.A..a.#.|...Z..[.|
|00000a10| 23 88 c3 09 81 5c 5c 00 | 81 5b 00 23 88 c3 09 81 |#....\\.|.[.#....|
|00000a20| 62 00 81 63 00 23 88 c3 | 09 81 64 00 d1 23 88 c3 |b..c.#..|..d..#..|
|00000a30| 09 81 65 00 81 66 00 23 | 88 c3 09 81 67 00 81 66 |..e..f.#|....g..f|
|00000a40| 00 23 88 0e 21 ac 8a c3 | 09 81 68 00 81 69 00 23 |.#..!...|..h..i.#|
|00000a50| 88 c3 09 81 6a 00 d1 23 | 88 c3 09 81 6b 00 81 5f |....j..#|....k.._|
|00000a60| 00 23 88 c3 09 81 6c 00 | 81 5f 00 23 88 c3 09 81 |.#....l.|._.#....|
|00000a70| 6d 00 d1 23 88 c3 09 81 | 6e 00 81 6f 00 23 88 c3 |m..#....|n..o.#..|
|00000a80| 09 81 70 00 81 6f 00 23 | 88 c3 09 81 71 00 81 6f |..p..o.#|....q..o|
|00000a90| 00 23 88 0e 72 ab 92 c3 | 09 81 73 00 81 6f 00 23 |.#..r...|..s..o.#|
|00000aa0| 88 c3 09 81 74 00 d3 23 | 88 c3 09 81 75 00 81 76 |....t..#|....u..v|
|00000ab0| 00 23 88 c1 09 4d 88 81 | 77 00 81 78 00 21 87 22 |.#...M..|w..x.!."|
|00000ac0| 20 5b 6d 61 6b 65 2d 73 | 70 61 72 73 65 2d 6b 65 | [make-s|parse-ke|
|00000ad0| 79 6d 61 70 20 65 64 69 | 66 66 2d 6d 6f 64 65 2d |ymap edi|ff-mode-|
|00000ae0| 6d 61 70 20 73 75 70 70 | 72 65 73 73 2d 6b 65 79 |map supp|ress-key|
|00000af0| 6d 61 70 20 64 65 66 69 | 6e 65 2d 6b 65 79 20 22 |map defi|ne-key "|
|00000b00| 70 22 20 65 64 69 66 66 | 2d 70 72 65 76 69 6f 75 |p" ediff|-previou|
|00000b10| 73 2d 64 69 66 66 65 72 | 65 6e 63 65 20 22 7f 22 |s-differ|ence "."|
|00000b20| 20 5b 62 61 63 6b 73 70 | 61 63 65 5d 20 5b 64 65 | [backsp|ace] [de|
|00000b30| 6c 65 74 65 5d 20 22 08 | 22 20 65 64 69 66 66 2d |lete] ".|" ediff-|
|00000b40| 6e 6f 2d 65 6d 61 63 73 | 2d 68 65 6c 70 2d 69 6e |no-emacs|-help-in|
|00000b50| 2d 63 6f 6e 74 72 6f 6c | 2d 62 75 66 66 65 72 20 |-control|-buffer |
|00000b60| 22 6e 22 20 65 64 69 66 | 66 2d 6e 65 78 74 2d 64 |"n" edif|f-next-d|
|00000b70| 69 66 66 65 72 65 6e 63 | 65 20 22 20 22 20 22 6a |ifferenc|e " " "j|
|00000b80| 22 20 65 64 69 66 66 2d | 6a 75 6d 70 2d 74 6f 2d |" ediff-|jump-to-|
|00000b90| 64 69 66 66 65 72 65 6e | 63 65 20 22 67 22 20 6e |differen|ce "g" n|
|00000ba0| 69 6c 20 22 67 61 22 20 | 65 64 69 66 66 2d 6a 75 |il "ga" |ediff-ju|
|00000bb0| 6d 70 2d 74 6f 2d 64 69 | 66 66 65 72 65 6e 63 65 |mp-to-di|fference|
|00000bc0| 2d 61 74 2d 70 6f 69 6e | 74 20 22 67 62 22 20 22 |-at-poin|t "gb" "|
|00000bd0| 71 22 20 65 64 69 66 66 | 2d 71 75 69 74 20 22 44 |q" ediff|-quit "D|
|00000be0| 22 20 65 64 69 66 66 2d | 73 68 6f 77 2d 64 69 66 |" ediff-|show-dif|
|00000bf0| 66 2d 6f 75 74 70 75 74 | 20 22 7a 22 20 65 64 69 |f-output| "z" edi|
|00000c00| 66 66 2d 73 75 73 70 65 | 6e 64 20 22 0c 22 20 65 |ff-suspe|nd "." e|
|00000c10| 64 69 66 66 2d 72 65 63 | 65 6e 74 65 72 20 22 7c |diff-rec|enter "||
|00000c20| 22 20 65 64 69 66 66 2d | 74 6f 67 67 6c 65 2d 73 |" ediff-|toggle-s|
|00000c30| 70 6c 69 74 20 22 68 22 | 20 65 64 69 66 66 2d 74 |plit "h"| ediff-t|
|00000c40| 6f 67 67 6c 65 2d 68 69 | 6c 69 74 20 65 64 69 66 |oggle-hi|lit edif|
|00000c50| 66 2d 77 6f 72 64 2d 6d | 6f 64 65 20 22 40 22 20 |f-word-m|ode "@" |
|00000c60| 65 64 69 66 66 2d 74 6f | 67 67 6c 65 2d 61 75 74 |ediff-to|ggle-aut|
|00000c70| 6f 72 65 66 69 6e 65 20 | 65 64 69 66 66 2d 6e 61 |orefine |ediff-na|
|00000c80| 72 72 6f 77 2d 6a 6f 62 | 20 22 25 22 20 65 64 69 |rrow-job| "%" edi|
|00000c90| 66 66 2d 74 6f 67 67 6c | 65 2d 6e 61 72 72 6f 77 |ff-toggl|e-narrow|
|00000ca0| 2d 72 65 67 69 6f 6e 20 | 22 7e 22 20 65 64 69 66 |-region |"~" edif|
|00000cb0| 66 2d 73 77 61 70 2d 62 | 75 66 66 65 72 73 20 22 |f-swap-b|uffers "|
|00000cc0| 76 22 20 65 64 69 66 66 | 2d 73 63 72 6f 6c 6c 2d |v" ediff|-scroll-|
|00000cd0| 76 65 72 74 69 63 61 6c | 6c 79 20 22 16 22 20 22 |vertical|ly "." "|
|00000ce0| 5e 22 20 22 f6 22 20 22 | 56 22 20 22 3c 22 20 65 |^" "." "|V" "<" e|
|00000cf0| 64 69 66 66 2d 73 63 72 | 6f 6c 6c 2d 68 6f 72 69 |diff-scr|oll-hori|
|00000d00| 7a 6f 6e 74 61 6c 6c 79 | 20 22 3e 22 20 22 69 22 |zontally| ">" "i"|
|00000d10| 20 65 64 69 66 66 2d 73 | 74 61 74 75 73 2d 69 6e | ediff-s|tatus-in|
|00000d20| 66 6f 20 22 45 22 20 65 | 64 69 66 66 2d 64 6f 63 |fo "E" e|diff-doc|
|00000d30| 75 6d 65 6e 74 61 74 69 | 6f 6e 20 22 3f 22 20 65 |umentati|on "?" e|
|00000d40| 64 69 66 66 2d 74 6f 67 | 67 6c 65 2d 68 65 6c 70 |diff-tog|gle-help|
|00000d50| 20 22 21 22 20 65 64 69 | 66 66 2d 75 70 64 61 74 | "!" edi|ff-updat|
|00000d60| 65 2d 64 69 66 66 73 20 | 22 4d 22 20 65 64 69 66 |e-diffs |"M" edif|
|00000d70| 66 2d 73 68 6f 77 2d 6d | 65 74 61 2d 62 75 66 66 |f-show-m|eta-buff|
|00000d80| 65 72 20 22 52 22 20 65 | 64 69 66 66 2d 73 68 6f |er "R" e|diff-sho|
|00000d90| 77 2d 72 65 67 69 73 74 | 72 79 20 22 2a 22 20 65 |w-regist|ry "*" e|
|00000da0| 64 69 66 66 2d 6d 61 6b | 65 2d 6f 72 2d 6b 69 6c |diff-mak|e-or-kil|
|00000db0| 6c 2d 66 69 6e 65 2d 64 | 69 66 66 73 20 22 61 22 |l-fine-d|iffs "a"|
|00000dc0| 20 22 62 22 20 22 72 22 | 20 65 64 69 66 66 2d 6d | "b" "r"| ediff-m|
|00000dd0| 65 72 67 65 2d 6a 6f 62 | 20 22 2f 22 20 65 64 69 |erge-job| "/" edi|
|00000de0| 66 66 2d 73 68 6f 77 2d | 61 6e 63 65 73 74 6f 72 |ff-show-|ancestor|
|00000df0| 20 23 5b 28 61 72 67 29 | 20 22 c0 09 c2 5c 22 87 | #[(arg)| "...\".|
|00000e00| 22 20 5b 65 64 69 66 66 | 2d 64 69 66 66 2d 74 6f |" [ediff|-diff-to|
|00000e10| 2d 64 69 66 66 20 61 72 | 67 20 22 61 63 22 5d 20 |-diff ar|g "ac"] |
|00000e20| 33 20 6e 69 6c 20 22 50 | 22 5d 20 23 5b 28 61 72 |3 nil "P|"] #[(ar|
|00000e30| 67 29 20 22 c0 09 c2 5c | 22 87 22 20 5b 65 64 69 |g) "...\|"." [edi|
|00000e40| 66 66 2d 64 69 66 66 2d | 74 6f 2d 64 69 66 66 20 |ff-diff-|to-diff |
|00000e50| 61 72 67 20 22 62 63 22 | 5d 20 33 20 6e 69 6c 20 |arg "bc"|] 3 nil |
|00000e60| 22 50 22 5d 20 23 5b 28 | 61 72 67 29 20 22 c0 09 |"P"] #[(|arg) "..|
|00000e70| c2 5c 22 87 22 20 5b 65 | 64 69 66 66 2d 72 65 73 |.\"." [e|diff-res|
|00000e80| 74 6f 72 65 2d 64 69 66 | 66 20 61 72 67 20 39 39 |tore-dif|f arg 99|
|00000e90| 5d 20 33 20 6e 69 6c 20 | 22 50 22 5d 20 22 73 22 |] 3 nil |"P"] "s"|
|00000ea0| 20 65 64 69 66 66 2d 73 | 68 72 69 6e 6b 2d 77 69 | ediff-s|hrink-wi|
|00000eb0| 6e 64 6f 77 2d 43 20 22 | 2b 22 20 65 64 69 66 66 |ndow-C "|+" ediff|
|00000ec0| 2d 63 6f 6d 62 69 6e 65 | 2d 64 69 66 66 73 20 22 |-combine|-diffs "|
|00000ed0| 24 22 20 65 64 69 66 66 | 2d 74 6f 67 67 6c 65 2d |$" ediff|-toggle-|
|00000ee0| 73 68 6f 77 2d 63 6c 61 | 73 68 65 73 2d 6f 6e 6c |show-cla|shes-onl|
|00000ef0| 79 20 22 26 22 20 65 64 | 69 66 66 2d 72 65 2d 6d |y "&" ed|iff-re-m|
|00000f00| 65 72 67 65 20 65 64 69 | 66 66 2d 33 77 61 79 2d |erge edi|ff-3way-|
|00000f10| 63 6f 6d 70 61 72 69 73 | 6f 6e 2d 6a 6f 62 20 22 |comparis|on-job "|
|00000f20| 61 62 22 20 65 64 69 66 | 66 2d 64 69 66 66 2d 74 |ab" edif|f-diff-t|
|00000f30| 6f 2d 64 69 66 66 20 22 | 62 61 22 20 22 61 63 22 |o-diff "|ba" "ac"|
|00000f40| 20 22 62 63 22 20 22 63 | 22 20 22 63 61 22 20 22 | "bc" "c|" "ca" "|
|00000f50| 63 62 22 20 22 72 61 22 | 20 65 64 69 66 66 2d 72 |cb" "ra"| ediff-r|
|00000f60| 65 73 74 6f 72 65 2d 64 | 69 66 66 20 22 72 62 22 |estore-d|iff "rb"|
|00000f70| 20 22 72 63 22 20 22 43 | 22 20 65 64 69 66 66 2d | "rc" "C|" ediff-|
|00000f80| 74 6f 67 67 6c 65 2d 72 | 65 61 64 2d 6f 6e 6c 79 |toggle-r|ead-only|
|00000f90| 20 23 5b 28 61 72 67 29 | 20 22 c0 09 c2 5c 22 87 | #[(arg)| "...\".|
|00000fa0| 22 20 5b 65 64 69 66 66 | 2d 64 69 66 66 2d 74 6f |" [ediff|-diff-to|
|00000fb0| 2d 64 69 66 66 20 61 72 | 67 20 22 61 62 22 5d 20 |-diff ar|g "ab"] |
|00000fc0| 33 20 6e 69 6c 20 22 50 | 22 5d 20 23 5b 28 61 72 |3 nil "P|"] #[(ar|
|00000fd0| 67 29 20 22 c0 09 c2 5c | 22 87 22 20 5b 65 64 69 |g) "...\|"." [edi|
|00000fe0| 66 66 2d 64 69 66 66 2d | 74 6f 2d 64 69 66 66 20 |ff-diff-|to-diff |
|00000ff0| 61 72 67 20 22 62 61 22 | 5d 20 33 20 6e 69 6c 20 |arg "ba"|] 3 nil |
|00001000| 22 50 22 5d 20 22 47 22 | 20 65 64 69 66 66 2d 73 |"P"] "G"| ediff-s|
|00001010| 75 62 6d 69 74 2d 72 65 | 70 6f 72 74 20 22 23 22 |ubmit-re|port "#"|
|00001020| 20 22 23 68 22 20 65 64 | 69 66 66 2d 74 6f 67 67 | "#h" ed|iff-togg|
|00001030| 6c 65 2d 72 65 67 65 78 | 70 2d 6d 61 74 63 68 20 |le-regex|p-match |
|00001040| 22 23 66 22 20 22 23 23 | 22 20 65 64 69 66 66 2d |"#f" "##|" ediff-|
|00001050| 74 6f 67 67 6c 65 2d 73 | 6b 69 70 2d 73 69 6d 69 |toggle-s|kip-simi|
|00001060| 6c 61 72 20 22 6f 22 20 | 22 41 22 20 22 42 22 20 |lar "o" |"A" "B" |
|00001070| 22 77 22 20 22 77 61 22 | 20 65 64 69 66 66 2d 73 |"w" "wa"| ediff-s|
|00001080| 61 76 65 2d 62 75 66 66 | 65 72 20 22 77 62 22 20 |ave-buff|er "wb" |
|00001090| 22 77 64 22 20 65 64 69 | 66 66 2d 33 77 61 79 2d |"wd" edi|ff-3way-|
|000010a0| 6a 6f 62 20 22 77 63 22 | 20 22 67 63 22 20 22 6d |job "wc"| "gc" "m|
|000010b0| 22 20 65 64 69 66 66 2d | 74 6f 67 67 6c 65 2d 77 |" ediff-|toggle-w|
|000010c0| 69 64 65 2d 64 69 73 70 | 6c 61 79 20 72 75 6e 2d |ide-disp|lay run-|
|000010d0| 68 6f 6f 6b 73 20 65 64 | 69 66 66 2d 6b 65 79 6d |hooks ed|iff-keym|
|000010e0| 61 70 2d 73 65 74 75 70 | 2d 68 6f 6f 6b 73 5d 20 |ap-setup|-hooks] |
|000010f0| 34 20 22 5c 0a 53 65 74 | 20 75 70 20 74 68 65 20 |4 "\.Set| up the |
|00001100| 6b 65 79 6d 61 70 20 75 | 73 65 64 20 69 6e 20 74 |keymap u|sed in t|
|00001110| 68 65 20 63 6f 6e 74 72 | 6f 6c 20 62 75 66 66 65 |he contr|ol buffe|
|00001120| 72 20 6f 66 20 45 64 69 | 66 66 2e 22 5d 29 0a 28 |r of Edi|ff."]).(|
|00001130| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00001140| c3 4d 87 22 20 5b 72 65 | 71 75 69 72 65 20 65 64 |.M." [re|quire ed|
|00001150| 69 66 66 2d 77 69 6e 64 | 20 65 64 69 66 66 2d 73 |iff-wind| ediff-s|
|00001160| 65 74 75 70 20 23 5b 28 | 62 75 66 66 65 72 2d 41 |etup #[(|buffer-A|
|00001170| 20 66 69 6c 65 2d 41 20 | 62 75 66 66 65 72 2d 42 | file-A |buffer-B|
|00001180| 20 66 69 6c 65 2d 42 20 | 62 75 66 66 65 72 2d 43 | file-B |buffer-C|
|00001190| 20 66 69 6c 65 2d 43 20 | 73 74 61 72 74 75 70 2d | file-C |startup-|
|000011a0| 68 6f 6f 6b 73 20 73 65 | 74 75 70 2d 70 61 72 61 |hooks se|tup-para|
|000011b0| 6d 65 74 65 72 73 29 20 | 22 c0 09 21 11 c0 5c 6e |meters) |"..!..\n|
|000011c0| 21 12 0b 3b ab 84 c0 0b | 21 13 c4 c5 c6 5c 22 1e |!..;....|!....\".|
|000011d0| 07 70 1e 08 0e 09 ab 9b | ca 0e 09 21 ab 95 cb ca |.p......|...!....|
|000011e0| 0e 09 21 21 ab 8d cc 8e | 0e 09 71 88 cd 0e 07 21 |..!!....|..q....!|
|000011f0| 29 aa 89 0e 0e cf 3d ae | 83 d0 d1 21 29 1e 12 70 |).....=.|...!)..p|
|00001200| 1e 08 0e 12 83 96 05 ca | 0e 12 21 83 96 05 cb ca |........|..!.....|
|00001210| 0e 12 21 21 83 96 05 d3 | 8e 0e 12 71 88 d4 20 88 |..!!....|...q.. .|
|00001220| 0e 15 ab 92 0e 15 40 40 | 0e 15 40 41 4c 88 0e 15 |......@@|..@AL...|
|00001230| 41 89 16 15 ac 6e 0e 16 | d7 3e 16 18 0e 16 d9 3e |A....n..|.>.....>|
|00001240| 16 1a 0e 16 db 3e 16 1c | 0e 18 ae 82 0e 1a 16 1d |.....>..|........|
|00001250| 0e 18 ae 82 0e 1c 16 1e | 0e 16 df 3e 16 20 0e 16 |........|...>. ..|
|00001260| e1 3e 16 5c 22 0e 16 e3 | 3e 16 24 e5 e6 21 88 e5 |.>.\"...|>.$..!..|
|00001270| e7 21 88 e5 e8 21 88 e5 | e9 21 88 e5 ea 21 88 e5 |.!...!..|.!...!..|
|00001280| eb 21 88 0e 1a ab da 0e | 29 ec 3d ab 84 0e 2d aa |.!......|).=...-.|
|00001290| 82 0e 09 1e 2e 0e 2f 16 | 28 0e 30 16 31 cd c4 f2 |....../.|(.0.1...|
|000012a0| c6 5c 22 21 16 30 8a 0e | 30 71 88 f3 0e 2e 21 88 |.\"!.0..|0q....!.|
|000012b0| 70 1e 08 0e 2e ab 99 ca | 0e 2e 21 ab 93 cb ca 0e |p.......|..!.....|
|000012c0| 2e 21 21 ab 8b f4 8e 0e | 2e 71 88 0e 35 29 aa 89 |.!!.....|.q..5)..|
|000012d0| 0e 0e cf 3d ae 83 d0 d1 | 21 29 20 88 f6 f7 f8 5c |...=....|!) ....\|
|000012e0| 22 88 2a f9 16 3a 0e 09 | 16 3b 0e 2d 16 3c 0e 30 |".*..:..|.;.-.<.0|
|000012f0| 16 3d 0e 12 16 3e ff 81 | 40 00 0e 07 5c 22 ab 8d |.=...>..|@...\"..|
|00001300| 0e 07 81 41 00 94 81 41 | 00 95 4f aa 83 81 42 00 |...A...A|..O...B.|
|00001310| 16 43 81 41 00 81 44 00 | 0e 43 ff 81 45 00 0e 43 |.C.A..D.|.C..E..C|
|00001320| 5c 22 ae 83 81 41 00 f9 | 4f 21 53 5d 16 46 cd c4 |\"...A..|O!S].F..|
|00001330| 81 47 00 c6 5c 22 21 16 | 48 70 1e 08 0e 09 ab aa |.G..\"!.|Hp......|
|00001340| ca 0e 09 21 ab a4 cb ca | 0e 09 21 21 ab 9c 81 49 |...!....|..!!...I|
|00001350| 00 8e 0e 09 71 88 0e 4a | 40 81 4b 00 9d ab 88 81 |....q..J|@.K.....|
|00001360| 4c 00 0e 4a 38 16 4a 29 | aa 8a 0e 0e cf 3d ac 84 |L..J8.J)|.....=..|
|00001370| d0 d1 21 88 29 70 1e 08 | 0e 2d ab aa ca 0e 2d 21 |..!.)p..|.-....-!|
|00001380| ab a4 cb ca 0e 2d 21 21 | ab 9c 81 4d 00 8e 0e 2d |.....-!!|...M...-|
|00001390| 71 88 0e 4a 40 81 4b 00 | 9d ab 88 81 4c 00 0e 4a |q..J@.K.|....L..J|
|000013a0| 38 16 4a 29 aa 8a 0e 0e | cf 3d ac 84 d0 d1 21 88 |8.J)....|.=....!.|
|000013b0| 29 0e 1d ab bc 70 1e 08 | 0e 30 ab aa ca 0e 30 21 |)....p..|.0....0!|
|000013c0| ab a4 cb ca 0e 30 21 21 | ab 9c 81 4e 00 8e 0e 30 |.....0!!|...N...0|
|000013d0| 71 88 0e 4a 40 81 4b 00 | 9d ab 88 81 4c 00 0e 4a |q..J@.K.|....L..J|
|000013e0| 38 16 4a 29 aa 8a 0e 0e | cf 3d ac 84 d0 d1 21 88 |8.J)....|.=....!.|
|000013f0| 29 0e 31 ab ca ca 0e 31 | 21 ab c4 cb ca 0e 31 21 |).1....1|!.....1!|
|00001400| 21 ab bc 70 1e 08 0e 31 | ab aa ca 0e 31 21 ab a4 |!..p...1|....1!..|
|00001410| cb ca 0e 31 21 21 ab 9c | 81 4f 00 8e 0e 31 71 88 |...1!!..|.O...1q.|
|00001420| 0e 4a 40 81 4b 00 9d ab | 88 81 4c 00 0e 4a 38 16 |.J@.K...|..L..J8.|
|00001430| 4a 29 aa 8a 0e 0e cf 3d | ac 84 d0 d1 21 88 29 81 |J).....=|....!.).|
|00001440| 50 00 20 88 0e 1e ab 85 | 81 51 00 aa 83 81 52 00 |P. .....|.Q....R.|
|00001450| 16 53 81 54 00 81 55 00 | 81 56 00 0e 3b 23 81 54 |.S.T..U.|.V..;#.T|
|00001460| 00 81 57 00 81 58 00 0e | 3c 23 81 54 00 81 59 00 |..W..X..|<#.T..Y.|
|00001470| 81 5a 00 0e 3d 23 45 16 | 5b 0e 5c 5c ab 86 0e 5d |.Z..=#E.|[.\\...]|
|00001480| 16 5e aa 84 0e 5b 16 5e | 81 5f 00 20 88 0e 5d ac |.^...[.^|._. ..].|
|00001490| 84 0e 5b 16 5d 70 1e 08 | 0e 3b ab e7 ca 0e 3b 21 |..[.]p..|.;....;!|
|000014a0| ab e1 cb ca 0e 3b 21 21 | ab d9 81 60 00 8e 0e 3b |.....;!!|...`...;|
|000014b0| 71 88 81 61 00 20 88 81 | 62 00 81 63 00 21 88 70 |q..a. ..|b..c.!.p|
|000014c0| 1e 08 0e 12 ab 9b ca 0e | 12 21 ab 95 cb ca 0e 12 |........|.!......|
|000014d0| 21 21 ab 8d 81 64 00 8e | 0e 12 71 88 0e 1a 29 aa |!!...d..|..q...).|
|000014e0| 89 0e 0e cf 3d ae 83 d0 | d1 21 29 ab 85 81 65 00 |....=...|.!)...e.|
|000014f0| 16 3a 0e 12 0e 66 3e ac | 87 0e 12 0e 66 42 16 66 |.:...f>.|....fB.f|
|00001500| 29 aa 8a 0e 0e cf 3d ac | 84 d0 d1 21 88 29 70 1e |).....=.|...!.)p.|
|00001510| 08 0e 3c ab e7 ca 0e 3c | 21 ab e1 cb ca 0e 3c 21 |..<....<|!.....<!|
|00001520| 21 ab d9 81 67 00 8e 0e | 3c 71 88 81 61 00 20 88 |!...g...|<q..a. .|
|00001530| 81 62 00 81 63 00 21 88 | 70 1e 08 0e 12 ab 9b ca |.b..c.!.|p.......|
|00001540| 0e 12 21 ab 95 cb ca 0e | 12 21 21 ab 8d 81 68 00 |..!.....|.!!...h.|
|00001550| 8e 0e 12 71 88 0e 1a 29 | aa 89 0e 0e cf 3d ae 83 |...q...)|.....=..|
|00001560| d0 d1 21 29 ab 85 81 65 | 00 16 3a 0e 12 0e 66 3e |..!)...e|..:...f>|
|00001570| ac 87 0e 12 0e 66 42 16 | 66 29 aa 8a 0e 0e cf 3d |.....fB.|f).....=|
|00001580| ac 84 d0 d1 21 88 29 0e | 1d ab c6 70 1e 08 0e 3d |....!.).|...p...=|
|00001590| ab b4 ca 0e 3d 21 ab ae | cb ca 0e 3d 21 21 ab a6 |....=!..|...=!!..|
|000015a0| 81 69 00 8e 0e 3d 71 88 | 81 61 00 20 88 81 62 00 |.i...=q.|.a. ..b.|
|000015b0| 81 63 00 21 88 0e 12 0e | 66 3e ac 87 0e 12 0e 66 |.c.!....|f>.....f|
|000015c0| 42 16 66 29 aa 8a 0e 0e | cf 3d ac 84 d0 d1 21 88 |B.f)....|.=....!.|
|000015d0| 29 0e 31 ab d9 ca 0e 31 | 21 ab d3 cb ca 0e 31 21 |).1....1|!.....1!|
|000015e0| 21 ab cb 70 1e 08 0e 31 | ab b9 ca 0e 31 21 ab b3 |!..p...1|....1!..|
|000015f0| cb ca 0e 31 21 21 ab ab | 81 6a 00 8e 0e 31 71 88 |...1!!..|.j...1q.|
|00001600| 81 61 00 20 88 81 65 00 | 16 3a 81 62 00 81 63 00 |.a. ..e.|.:.b..c.|
|00001610| 21 88 0e 12 0e 66 3e ac | 87 0e 12 0e 66 42 16 66 |!....f>.|....fB.f|
|00001620| 29 aa 8a 0e 0e cf 3d ac | 84 d0 d1 21 88 29 0e 53 |).....=.|...!.).S|
|00001630| 09 5c 6e 0b 23 88 0e 6b | 47 16 6c 81 6d 00 16 6e |.\n.#..k|G.l.m..n|
|00001640| 81 6f 00 81 70 00 21 88 | 81 6f 00 81 71 00 21 88 |.o..p.!.|.o..q.!.|
|00001650| 0e 1d ab 88 81 6f 00 81 | 72 00 21 88 0e 1c ab 88 |.....o..|r.!.....|
|00001660| 81 6f 00 81 73 00 21 88 | 81 74 00 0e 09 0e 2d 0e |.o..s.!.|.t....-.|
|00001670| 30 0e 12 24 88 0e 5d 40 | 1e 75 81 76 00 0e 75 21 |0..$..]@|.u.v..u!|
|00001680| ad 92 0e 77 ab 88 81 78 | 00 0e 75 21 aa 86 81 79 |...w...x|..u!...y|
|00001690| 00 0e 75 21 29 0e 5d 41 | 40 1e 75 81 76 00 0e 75 |..u!).]A|@.u.v..u|
|000016a0| 21 ad 92 0e 77 ab 88 81 | 78 00 0e 75 21 aa 86 81 |!...w...|x..u!...|
|000016b0| 79 00 0e 75 21 29 81 4c | 00 0e 5d 38 1e 75 81 76 |y..u!).L|..]8.u.v|
|000016c0| 00 0e 75 21 ad 92 0e 77 | ab 88 81 78 00 0e 75 21 |..u!...w|...x..u!|
|000016d0| aa 86 81 79 00 0e 75 21 | 29 1e 7a 1e 7b 1e 7c 8a |...y..u!|).z.{.|.|
|000016e0| 81 7d 00 0e 7e 21 88 0e | 7c 62 88 29 8a 81 7d 00 |.}..~!..||b.)..}.|
|000016f0| 0e 7f 21 88 0e 7b 62 88 | 29 0e 1d ab 8d 8a 81 7d |..!..{b.|)......}|
|00001700| 00 0e 80 21 88 0e 7a 62 | 88 29 2b 81 7d 00 0e 81 |...!..zb|.)+.}...|
|00001710| 21 88 81 82 00 20 88 81 | 62 00 81 83 00 21 88 81 |!.... ..|b....!..|
|00001720| 84 00 20 88 81 65 00 16 | 3a 0e 12 0e 85 42 16 85 |.. ..e..|:....B..|
|00001730| 81 86 00 20 88 0e 87 ab | 95 ca 0e 87 21 ab 8f cb |... ....|....!...|
|00001740| ca 0e 87 21 21 ab 87 81 | 88 00 0e 87 21 88 81 62 |...!!...|....!..b|
|00001750| 00 81 89 00 21 88 29 aa | 8a 0e 0e cf 3d ac 84 d0 |....!.).|....=...|
|00001760| d1 21 88 29 0e 12 2a 87 | 22 20 5b 65 78 70 61 6e |.!.)..*.|" [expan|
|00001770| 64 2d 66 69 6c 65 2d 6e | 61 6d 65 20 66 69 6c 65 |d-file-n|ame file|
|00001780| 2d 41 20 66 69 6c 65 2d | 42 20 66 69 6c 65 2d 43 |-A file-|B file-C|
|00001790| 20 65 64 69 66 66 2d 75 | 6e 69 71 75 65 2d 62 75 | ediff-u|nique-bu|
|000017a0| 66 66 65 72 2d 6e 61 6d | 65 20 22 2a 45 64 69 66 |ffer-nam|e "*Edif|
|000017b0| 66 20 43 6f 6e 74 72 6f | 6c 20 50 61 6e 65 6c 22 |f Contro|l Panel"|
|000017c0| 20 22 2a 22 20 63 6f 6e | 74 72 6f 6c 2d 62 75 66 | "*" con|trol-buf|
|000017d0| 66 65 72 2d 6e 61 6d 65 | 20 53 74 61 72 74 42 75 |fer-name| StartBu|
|000017e0| 66 66 65 72 20 62 75 66 | 66 65 72 2d 41 20 67 65 |ffer buf|fer-A ge|
|000017f0| 74 2d 62 75 66 66 65 72 | 20 62 75 66 66 65 72 2d |t-buffer| buffer-|
|00001800| 6e 61 6d 65 20 28 28 73 | 65 74 2d 62 75 66 66 65 |name ((s|et-buffe|
|00001810| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|00001820| 67 65 74 2d 62 75 66 66 | 65 72 2d 63 72 65 61 74 |get-buff|er-creat|
|00001830| 65 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 65 |e this-c|ommand e|
|00001840| 64 69 66 66 2d 71 75 69 | 74 20 65 72 72 6f 72 20 |diff-qui|t error |
|00001850| 22 59 6f 75 27 76 65 20 | 6b 69 6c 6c 65 64 20 61 |"You've |killed a|
|00001860| 6e 20 65 73 73 65 6e 74 | 69 61 6c 20 45 64 69 66 |n essent|ial Edif|
|00001870| 66 20 62 75 66 66 65 72 | 2d 2d 2d 50 6c 65 61 73 |f buffer|---Pleas|
|00001880| 65 20 71 75 69 74 20 45 | 64 69 66 66 22 20 63 6f |e quit E|diff" co|
|00001890| 6e 74 72 6f 6c 2d 62 75 | 66 66 65 72 20 28 28 73 |ntrol-bu|ffer ((s|
|000018a0| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|000018b0| 75 66 66 65 72 29 29 20 | 65 64 69 66 66 2d 6d 6f |uffer)) |ediff-mo|
|000018c0| 64 65 20 73 65 74 75 70 | 2d 70 61 72 61 6d 65 74 |de setup|-paramet|
|000018d0| 65 72 73 20 65 64 69 66 | 66 2d 6a 6f 62 2d 6e 61 |ers edif|f-job-na|
|000018e0| 6d 65 20 28 65 64 69 66 | 66 2d 66 69 6c 65 73 33 |me (edif|f-files3|
|000018f0| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 73 33 29 | ediff-b|uffers3)|
|00001900| 20 65 64 69 66 66 2d 33 | 77 61 79 2d 63 6f 6d 70 | ediff-3|way-comp|
|00001910| 61 72 69 73 6f 6e 2d 6a | 6f 62 20 28 65 64 69 66 |arison-j|ob (edif|
|00001920| 66 2d 6d 65 72 67 65 2d | 66 69 6c 65 73 20 65 64 |f-merge-|files ed|
|00001930| 69 66 66 2d 6d 65 72 67 | 65 2d 62 75 66 66 65 72 |iff-merg|e-buffer|
|00001940| 73 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 66 69 |s ediff-|merge-fi|
|00001950| 6c 65 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |les-with|-ancesto|
|00001960| 72 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 62 75 |r ediff-|merge-bu|
|00001970| 66 66 65 72 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |ffers-wi|th-ances|
|00001980| 74 6f 72 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |tor edif|f-merge-|
|00001990| 72 65 76 69 73 69 6f 6e | 73 20 65 64 69 66 66 2d |revision|s ediff-|
|000019a0| 6d 65 72 67 65 2d 72 65 | 76 69 73 69 6f 6e 73 2d |merge-re|visions-|
|000019b0| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 29 20 65 |with-anc|estor) e|
|000019c0| 64 69 66 66 2d 6d 65 72 | 67 65 2d 6a 6f 62 20 28 |diff-mer|ge-job (|
|000019d0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 66 69 6c 65 |ediff-me|rge-file|
|000019e0| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 20 |s-with-a|ncestor |
|000019f0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 62 75 66 66 |ediff-me|rge-buff|
|00001a00| 65 72 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ers-with|-ancesto|
|00001a10| 72 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 72 65 |r ediff-|merge-re|
|00001a20| 76 69 73 69 6f 6e 73 2d | 77 69 74 68 2d 61 6e 63 |visions-|with-anc|
|00001a30| 65 73 74 6f 72 29 20 65 | 64 69 66 66 2d 6d 65 72 |estor) e|diff-mer|
|00001a40| 67 65 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |ge-with-|ancestor|
|00001a50| 2d 6a 6f 62 20 65 64 69 | 66 66 2d 33 77 61 79 2d |-job edi|ff-3way-|
|00001a60| 6a 6f 62 20 65 64 69 66 | 66 2d 64 69 66 66 33 2d |job edif|f-diff3-|
|00001a70| 6a 6f 62 20 28 65 64 69 | 66 66 2d 77 69 6e 64 6f |job (edi|ff-windo|
|00001a80| 77 73 2d 77 6f 72 64 77 | 69 73 65 20 65 64 69 66 |ws-wordw|ise edif|
|00001a90| 66 2d 72 65 67 69 6f 6e | 73 2d 77 6f 72 64 77 69 |f-region|s-wordwi|
|00001aa0| 73 65 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 73 |se ediff|-windows|
|00001ab0| 2d 6c 69 6e 65 77 69 73 | 65 20 65 64 69 66 66 2d |-linewis|e ediff-|
|00001ac0| 72 65 67 69 6f 6e 73 2d | 6c 69 6e 65 77 69 73 65 |regions-|linewise|
|00001ad0| 29 20 65 64 69 66 66 2d | 6e 61 72 72 6f 77 2d 6a |) ediff-|narrow-j|
|00001ae0| 6f 62 20 28 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |ob (edif|f-window|
|00001af0| 73 2d 77 6f 72 64 77 69 | 73 65 20 65 64 69 66 66 |s-wordwi|se ediff|
|00001b00| 2d 77 69 6e 64 6f 77 73 | 2d 6c 69 6e 65 77 69 73 |-windows|-linewis|
|00001b10| 65 29 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 73 |e) ediff|-windows|
|00001b20| 2d 6a 6f 62 20 28 65 64 | 69 66 66 2d 77 69 6e 64 |-job (ed|iff-wind|
|00001b30| 6f 77 73 2d 77 6f 72 64 | 77 69 73 65 20 65 64 69 |ows-word|wise edi|
|00001b40| 66 66 2d 72 65 67 69 6f | 6e 73 2d 77 6f 72 64 77 |ff-regio|ns-wordw|
|00001b50| 69 73 65 29 20 65 64 69 | 66 66 2d 77 6f 72 64 2d |ise) edi|ff-word-|
|00001b60| 6d 6f 64 65 2d 6a 6f 62 | 20 6d 61 6b 65 2d 6c 6f |mode-job| make-lo|
|00001b70| 63 61 6c 2d 76 61 72 69 | 61 62 6c 65 20 65 64 69 |cal-vari|able edi|
|00001b80| 66 66 2d 70 72 65 66 65 | 72 2d 6c 6f 6e 67 2d 68 |ff-prefe|r-long-h|
|00001b90| 65 6c 70 2d 6d 65 73 73 | 61 67 65 20 65 64 69 66 |elp-mess|age edif|
|00001ba0| 66 2d 70 72 65 66 65 72 | 2d 69 63 6f 6e 69 66 69 |f-prefer|-iconifi|
|00001bb0| 65 64 2d 63 6f 6e 74 72 | 6f 6c 2d 66 72 61 6d 65 |ed-contr|ol-frame|
|00001bc0| 20 65 64 69 66 66 2d 73 | 70 6c 69 74 2d 77 69 6e | ediff-s|plit-win|
|00001bd0| 64 6f 77 2d 66 75 6e 63 | 74 69 6f 6e 20 65 64 69 |dow-func|tion edi|
|00001be0| 66 66 2d 64 65 66 61 75 | 6c 74 2d 76 61 72 69 61 |ff-defau|lt-varia|
|00001bf0| 6e 74 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 77 |nt ediff|-merge-w|
|00001c00| 69 6e 64 6f 77 2d 73 68 | 61 72 65 20 65 64 69 66 |indow-sh|are edif|
|00001c10| 66 2d 77 69 6e 64 6f 77 | 2d 73 65 74 75 70 2d 66 |f-window|-setup-f|
|00001c20| 75 6e 63 74 69 6f 6e 20 | 64 65 66 61 75 6c 74 2d |unction |default-|
|00001c30| 42 20 62 75 66 66 65 72 | 2d 42 20 62 75 66 20 65 |B buffer|-B buf e|
|00001c40| 64 69 66 66 2d 6d 65 72 | 67 65 2d 73 70 6c 69 74 |diff-mer|ge-split|
|00001c50| 2d 77 69 6e 64 6f 77 2d | 66 75 6e 63 74 69 6f 6e |-window-|function|
|00001c60| 20 62 75 66 66 65 72 2d | 43 20 65 64 69 66 66 2d | buffer-|C ediff-|
|00001c70| 61 6e 63 65 73 74 6f 72 | 2d 62 75 66 66 65 72 20 |ancestor|-buffer |
|00001c80| 22 2a 65 64 69 66 66 2d | 6d 65 72 67 65 22 20 69 |"*ediff-|merge" i|
|00001c90| 6e 73 65 72 74 2d 62 75 | 66 66 65 72 20 28 28 73 |nsert-bu|ffer ((s|
|00001ca0| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|00001cb0| 75 66 66 65 72 29 29 20 | 6d 61 6a 6f 72 2d 6d 6f |uffer)) |major-mo|
|00001cc0| 64 65 20 61 64 64 2d 68 | 6f 6f 6b 20 6c 6f 63 61 |de add-h|ook loca|
|00001cd0| 6c 2d 77 72 69 74 65 2d | 66 69 6c 65 2d 68 6f 6f |l-write-|file-hoo|
|00001ce0| 6b 73 20 65 64 69 66 66 | 2d 73 65 74 2d 6d 65 72 |ks ediff|-set-mer|
|00001cf0| 67 65 2d 6d 6f 64 65 20 | 6e 69 6c 20 62 75 66 66 |ge-mode |nil buff|
|00001d00| 65 72 2d 72 65 61 64 2d | 6f 6e 6c 79 20 65 64 69 |er-read-|only edi|
|00001d10| 66 66 2d 62 75 66 66 65 | 72 2d 41 20 65 64 69 66 |ff-buffe|r-A edif|
|00001d20| 66 2d 62 75 66 66 65 72 | 2d 42 20 65 64 69 66 66 |f-buffer|-B ediff|
|00001d30| 2d 62 75 66 66 65 72 2d | 43 20 65 64 69 66 66 2d |-buffer-|C ediff-|
|00001d40| 63 6f 6e 74 72 6f 6c 2d | 62 75 66 66 65 72 20 73 |control-|buffer s|
|00001d50| 74 72 69 6e 67 2d 6d 61 | 74 63 68 20 22 3c 5b 30 |tring-ma|tch "<[0|
|00001d60| 2d 39 5d 2a 3e 22 20 30 | 20 22 22 20 65 64 69 66 |-9]*>" 0| "" edif|
|00001d70| 66 2d 63 6f 6e 74 72 6f | 6c 2d 62 75 66 66 65 72 |f-contro|l-buffer|
|00001d80| 2d 73 75 66 66 69 78 20 | 73 74 72 69 6e 67 2d 74 |-suffix |string-t|
|00001d90| 6f 2d 6e 75 6d 62 65 72 | 20 22 5b 30 2d 39 5d 2b |o-number| "[0-9]+|
|00001da0| 22 20 65 64 69 66 66 2d | 63 6f 6e 74 72 6f 6c 2d |" ediff-|control-|
|00001db0| 62 75 66 66 65 72 2d 6e | 75 6d 62 65 72 20 22 2a |buffer-n|umber "*|
|00001dc0| 65 64 69 66 66 2d 65 72 | 72 6f 72 73 22 20 65 64 |ediff-er|rors" ed|
|00001dd0| 69 66 66 2d 65 72 72 6f | 72 2d 62 75 66 66 65 72 |iff-erro|r-buffer|
|00001de0| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|00001df0| 61 72 74 42 75 66 66 65 | 72 29 29 20 6d 6f 64 65 |artBuffe|r)) mode|
|00001e00| 2d 6c 69 6e 65 2d 66 6f | 72 6d 61 74 20 28 22 20 |-line-fo|rmat (" |
|00001e10| 41 3a 20 22 20 22 20 42 | 3a 20 22 20 22 20 43 3a |A: " " B|: " " C:|
|00001e20| 20 22 20 22 20 41 6e 63 | 65 73 74 6f 72 3a 20 22 | " " Anc|estor: "|
|00001e30| 29 20 32 20 28 28 73 65 | 74 2d 62 75 66 66 65 72 |) 2 ((se|t-buffer|
|00001e40| 20 53 74 61 72 74 42 75 | 66 66 65 72 29 29 20 28 | StartBu|ffer)) (|
|00001e50| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00001e60| 74 42 75 66 66 65 72 29 | 29 20 28 28 73 65 74 2d |tBuffer)|) ((set-|
|00001e70| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00001e80| 65 72 29 29 20 65 64 69 | 66 66 2d 73 61 76 65 2d |er)) edi|ff-save-|
|00001e90| 70 72 6f 74 65 63 74 65 | 64 2d 76 61 72 69 61 62 |protecte|d-variab|
|00001ea0| 6c 65 73 20 65 64 69 66 | 66 2d 73 65 74 75 70 2d |les edif|f-setup-|
|00001eb0| 64 69 66 66 2d 72 65 67 | 69 6f 6e 73 33 20 65 64 |diff-reg|ions3 ed|
|00001ec0| 69 66 66 2d 73 65 74 75 | 70 2d 64 69 66 66 2d 72 |iff-setu|p-diff-r|
|00001ed0| 65 67 69 6f 6e 73 20 65 | 64 69 66 66 2d 73 65 74 |egions e|diff-set|
|00001ee0| 75 70 2d 64 69 66 66 2d | 72 65 67 69 6f 6e 73 2d |up-diff-|regions-|
|00001ef0| 66 75 6e 63 74 69 6f 6e | 20 65 64 69 66 66 2d 6d |function| ediff-m|
|00001f00| 61 6b 65 2d 62 75 6c 6c | 65 74 2d 70 72 6f 6f 66 |ake-bull|et-proof|
|00001f10| 2d 6f 76 65 72 6c 61 79 | 20 28 70 6f 69 6e 74 2d |-overlay| (point-|
|00001f20| 6d 69 6e 29 20 28 70 6f | 69 6e 74 2d 6d 61 78 29 |min) (po|int-max)|
|00001f30| 20 28 70 6f 69 6e 74 2d | 6d 69 6e 29 20 28 70 6f | (point-|min) (po|
|00001f40| 69 6e 74 2d 6d 61 78 29 | 20 28 70 6f 69 6e 74 2d |int-max)| (point-|
|00001f50| 6d 69 6e 29 20 28 70 6f | 69 6e 74 2d 6d 61 78 29 |min) (po|int-max)|
|00001f60| 20 65 64 69 66 66 2d 77 | 69 64 65 2d 62 6f 75 6e | ediff-w|ide-boun|
|00001f70| 64 73 20 65 64 69 66 66 | 2d 73 74 61 72 74 2d 6e |ds ediff|-start-n|
|00001f80| 61 72 72 6f 77 65 64 20 | 65 64 69 66 66 2d 6e 61 |arrowed |ediff-na|
|00001f90| 72 72 6f 77 2d 62 6f 75 | 6e 64 73 20 65 64 69 66 |rrow-bou|nds edif|
|00001fa0| 66 2d 76 69 73 69 62 6c | 65 2d 62 6f 75 6e 64 73 |f-visibl|e-bounds|
|00001fb0| 20 65 64 69 66 66 2d 73 | 65 74 2d 6b 65 79 73 20 | ediff-s|et-keys |
|00001fc0| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00001fd0| 72 74 42 75 66 66 65 72 | 29 29 20 65 64 69 66 66 |rtBuffer|)) ediff|
|00001fe0| 2d 6e 75 6b 65 2d 73 65 | 6c 65 63 74 69 76 65 2d |-nuke-se|lective-|
|00001ff0| 64 69 73 70 6c 61 79 20 | 72 75 6e 2d 68 6f 6f 6b |display |run-hook|
|00002000| 73 20 65 64 69 66 66 2d | 70 72 65 70 61 72 65 2d |s ediff-|prepare-|
|00002010| 62 75 66 66 65 72 2d 68 | 6f 6f 6b 73 20 28 28 73 |buffer-h|ooks ((s|
|00002020| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|00002030| 75 66 66 65 72 29 29 20 | 74 20 65 64 69 66 66 2d |uffer)) |t ediff-|
|00002040| 74 68 69 73 2d 62 75 66 | 66 65 72 2d 65 64 69 66 |this-buf|fer-edif|
|00002050| 66 2d 73 65 73 73 69 6f | 6e 73 20 28 28 73 65 74 |f-sessio|ns ((set|
|00002060| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|00002070| 66 65 72 29 29 20 28 28 | 73 65 74 2d 62 75 66 66 |fer)) ((|set-buff|
|00002080| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00002090| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|000020a0| 61 72 74 42 75 66 66 65 | 72 29 29 20 28 28 73 65 |artBuffe|r)) ((se|
|000020b0| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|000020c0| 66 66 65 72 29 29 20 65 | 64 69 66 66 2d 64 69 66 |ffer)) e|diff-dif|
|000020d0| 66 65 72 65 6e 63 65 2d | 76 65 63 74 6f 72 2d 41 |ference-|vector-A|
|000020e0| 20 65 64 69 66 66 2d 6e | 75 6d 62 65 72 2d 6f 66 | ediff-n|umber-of|
|000020f0| 2d 64 69 66 66 65 72 65 | 6e 63 65 73 20 2d 31 20 |-differe|nces -1 |
|00002100| 65 64 69 66 66 2d 63 75 | 72 72 65 6e 74 2d 64 69 |ediff-cu|rrent-di|
|00002110| 66 66 65 72 65 6e 63 65 | 20 65 64 69 66 66 2d 6d |fference| ediff-m|
|00002120| 61 6b 65 2d 63 75 72 72 | 65 6e 74 2d 64 69 66 66 |ake-curr|ent-diff|
|00002130| 2d 6f 76 65 72 6c 61 79 | 20 41 20 42 20 43 20 41 |-overlay| A B C A|
|00002140| 6e 63 65 73 74 6f 72 20 | 65 64 69 66 66 2d 73 65 |ncestor |ediff-se|
|00002150| 74 75 70 2d 77 69 6e 64 | 6f 77 73 20 6f 76 65 72 |tup-wind|ows over|
|00002160| 6c 20 65 64 69 66 66 2d | 6f 76 65 72 6c 61 79 70 |l ediff-|overlayp|
|00002170| 20 65 64 69 66 66 2d 65 | 6d 61 63 73 2d 70 20 6f | ediff-e|macs-p o|
|00002180| 76 65 72 6c 61 79 2d 73 | 74 61 72 74 20 65 78 74 |verlay-s|tart ext|
|00002190| 65 6e 74 2d 73 74 61 72 | 74 2d 70 6f 73 69 74 69 |ent-star|t-positi|
|000021a0| 6f 6e 20 73 68 69 66 74 | 2d 43 20 73 68 69 66 74 |on shift|-C shift|
|000021b0| 2d 42 20 73 68 69 66 74 | 2d 41 20 73 65 6c 65 63 |-B shift|-A selec|
|000021c0| 74 2d 77 69 6e 64 6f 77 | 20 65 64 69 66 66 2d 77 |t-window| ediff-w|
|000021d0| 69 6e 64 6f 77 2d 41 20 | 65 64 69 66 66 2d 77 69 |indow-A |ediff-wi|
|000021e0| 6e 64 6f 77 2d 42 20 65 | 64 69 66 66 2d 77 69 6e |ndow-B e|diff-win|
|000021f0| 64 6f 77 2d 43 20 65 64 | 69 66 66 2d 63 6f 6e 74 |dow-C ed|iff-cont|
|00002200| 72 6f 6c 2d 77 69 6e 64 | 6f 77 20 65 64 69 66 66 |rol-wind|ow ediff|
|00002210| 2d 76 69 73 69 62 6c 65 | 2d 72 65 67 69 6f 6e 20 |-visible|-region |
|00002220| 73 74 61 72 74 75 70 2d | 68 6f 6f 6b 73 20 65 64 |startup-|hooks ed|
|00002230| 69 66 66 2d 72 65 66 72 | 65 73 68 2d 6d 6f 64 65 |iff-refr|esh-mode|
|00002240| 2d 6c 69 6e 65 73 20 65 | 64 69 66 66 2d 73 65 73 |-lines e|diff-ses|
|00002250| 73 69 6f 6e 2d 72 65 67 | 69 73 74 72 79 20 65 64 |sion-reg|istry ed|
|00002260| 69 66 66 2d 75 70 64 61 | 74 65 2d 72 65 67 69 73 |iff-upda|te-regis|
|00002270| 74 72 79 20 65 64 69 66 | 66 2d 6d 65 74 61 2d 62 |try edif|f-meta-b|
|00002280| 75 66 66 65 72 20 65 64 | 69 66 66 2d 75 70 64 61 |uffer ed|iff-upda|
|00002290| 74 65 2d 6d 65 74 61 2d | 62 75 66 66 65 72 20 65 |te-meta-|buffer e|
|000022a0| 64 69 66 66 2d 73 74 61 | 72 74 75 70 2d 68 6f 6f |diff-sta|rtup-hoo|
|000022b0| 6b 73 5d 20 37 5d 5d 20 | 32 29 0a 28 66 73 65 74 |ks] 7]] |2).(fset|
|000022c0| 20 27 65 64 69 66 66 2d | 73 65 74 75 70 2d 63 6f | 'ediff-|setup-co|
|000022d0| 6e 74 72 6f 6c 2d 62 75 | 66 66 65 72 20 23 5b 28 |ntrol-bu|ffer #[(|
|000022e0| 63 74 6c 2d 62 75 66 29 | 20 22 c0 c1 20 21 ab 85 |ctl-buf)| ".. !..|
|000022f0| 5c 6e 71 88 aa 84 c3 5c | 6e 21 88 c4 1d c6 20 88 |\nq....\|n!.... .|
|00002300| c7 20 88 0e 08 63 88 c9 | 20 88 ca 20 ac 83 cb 20 |. ...c..| .. ... |
|00002310| 88 cc cd 21 88 ce 20 88 | c1 20 16 0f d0 d1 0e 0f |...!.. .|. ......|
|00002320| 0e 12 0e 13 0e 14 0e 15 | d6 20 ad 82 0e 17 0e 18 |........|. ......|
|00002330| 26 08 16 19 65 62 88 0e | 1a cd 77 29 87 22 20 5b |&...eb..|..w)." [|
|00002340| 77 69 6e 64 6f 77 2d 64 | 65 64 69 63 61 74 65 64 |window-d|edicated|
|00002350| 2d 70 20 73 65 6c 65 63 | 74 65 64 2d 77 69 6e 64 |-p selec|ted-wind|
|00002360| 6f 77 20 63 74 6c 2d 62 | 75 66 20 73 77 69 74 63 |ow ctl-b|uf switc|
|00002370| 68 2d 74 6f 2d 62 75 66 | 66 65 72 20 32 20 77 69 |h-to-buf|fer 2 wi|
|00002380| 6e 64 6f 77 2d 6d 69 6e | 2d 68 65 69 67 68 74 20 |ndow-min|-height |
|00002390| 65 72 61 73 65 2d 62 75 | 66 66 65 72 20 65 64 69 |erase-bu|ffer edi|
|000023a0| 66 66 2d 73 65 74 2d 68 | 65 6c 70 2d 6d 65 73 73 |ff-set-h|elp-mess|
|000023b0| 61 67 65 20 65 64 69 66 | 66 2d 68 65 6c 70 2d 6d |age edif|f-help-m|
|000023c0| 65 73 73 61 67 65 20 73 | 68 72 69 6e 6b 2d 77 69 |essage s|hrink-wi|
|000023d0| 6e 64 6f 77 2d 69 66 2d | 6c 61 72 67 65 72 2d 74 |ndow-if-|larger-t|
|000023e0| 68 61 6e 2d 62 75 66 66 | 65 72 20 65 64 69 66 66 |han-buff|er ediff|
|000023f0| 2d 6d 75 6c 74 69 66 72 | 61 6d 65 2d 73 65 74 75 |-multifr|ame-setu|
|00002400| 70 2d 70 20 65 64 69 66 | 66 2d 69 6e 64 65 6e 74 |p-p edif|f-indent|
|00002410| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 20 73 65 |-help-me|ssage se|
|00002420| 74 2d 62 75 66 66 65 72 | 2d 6d 6f 64 69 66 69 65 |t-buffer|-modifie|
|00002430| 64 2d 70 20 6e 69 6c 20 | 65 64 69 66 66 2d 72 65 |d-p nil |ediff-re|
|00002440| 66 72 65 73 68 2d 6d 6f | 64 65 2d 6c 69 6e 65 73 |fresh-mo|de-lines|
|00002450| 20 65 64 69 66 66 2d 63 | 6f 6e 74 72 6f 6c 2d 77 | ediff-c|ontrol-w|
|00002460| 69 6e 64 6f 77 20 66 6f | 72 6d 61 74 20 22 25 53 |indow fo|rmat "%S|
|00002470| 25 53 25 53 25 53 25 53 | 25 53 25 53 22 20 65 64 |%S%S%S%S|%S%S" ed|
|00002480| 69 66 66 2d 77 69 6e 64 | 6f 77 2d 41 20 65 64 69 |iff-wind|ow-A edi|
|00002490| 66 66 2d 77 69 6e 64 6f | 77 2d 42 20 65 64 69 66 |ff-windo|w-B edif|
|000024a0| 66 2d 77 69 6e 64 6f 77 | 2d 43 20 65 64 69 66 66 |f-window|-C ediff|
|000024b0| 2d 73 70 6c 69 74 2d 77 | 69 6e 64 6f 77 2d 66 75 |-split-w|indow-fu|
|000024c0| 6e 63 74 69 6f 6e 20 65 | 64 69 66 66 2d 77 69 6e |nction e|diff-win|
|000024d0| 64 6f 77 2d 64 69 73 70 | 6c 61 79 2d 70 20 65 64 |dow-disp|lay-p ed|
|000024e0| 69 66 66 2d 6d 75 6c 74 | 69 66 72 61 6d 65 20 65 |iff-mult|iframe e|
|000024f0| 64 69 66 66 2d 77 69 64 | 65 2d 64 69 73 70 6c 61 |diff-wid|e-displa|
|00002500| 79 2d 70 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |y-p edif|f-window|
|00002510| 2d 63 6f 6e 66 69 67 2d | 73 61 76 65 64 20 65 64 |-config-|saved ed|
|00002520| 69 66 66 2d 77 68 69 74 | 65 73 70 61 63 65 5d 20 |iff-whit|espace] |
|00002530| 39 20 22 5c 0a 53 65 74 | 20 75 70 20 77 69 6e 64 |9 "\.Set| up wind|
|00002540| 6f 77 20 66 6f 72 20 63 | 6f 6e 74 72 6f 6c 20 62 |ow for c|ontrol b|
|00002550| 75 66 66 65 72 2e 22 5d | 29 0a 28 62 79 74 65 2d |uffer."]|).(byte-|
|00002560| 63 6f 64 65 20 22 c0 c1 | 4d 88 c2 c3 4d 88 c4 c5 |code "..|M...M...|
|00002570| 4d 87 22 20 5b 65 64 69 | 66 66 2d 68 65 6c 70 2d |M." [edi|ff-help-|
|00002580| 6d 65 73 73 61 67 65 2d | 6c 69 6e 65 2d 6c 65 6e |message-|line-len|
|00002590| 67 74 68 20 23 5b 6e 69 | 6c 20 22 8a 65 62 88 08 |gth #[ni|l ".eb..|
|000025a0| ab 84 c1 c2 21 88 c3 7f | 88 69 29 87 22 20 5b 65 |....!...|.i)." [e|
|000025b0| 64 69 66 66 2d 70 72 65 | 66 65 72 2d 6c 6f 6e 67 |diff-pre|fer-long|
|000025c0| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 20 6e 65 |-help-me|ssage ne|
|000025d0| 78 74 2d 6c 69 6e 65 20 | 31 20 6e 69 6c 5d 20 32 |xt-line |1 nil] 2|
|000025e0| 5d 20 65 64 69 66 66 2d | 69 6e 64 65 6e 74 2d 68 |] ediff-|indent-h|
|000025f0| 65 6c 70 2d 6d 65 73 73 | 61 67 65 20 23 5b 6e 69 |elp-mess|age #[ni|
|00002600| 6c 20 22 c0 c1 c2 20 21 | c3 20 5a 5d c4 a5 1d c6 |l "... !|. Z]....|
|00002610| 0d c7 5c 22 1e 08 8a 65 | 62 88 60 64 57 ad 8c 0e |..\"...e|b.`dW...|
|00002620| 08 63 88 c0 79 88 c9 79 | 88 aa 6f 2b 87 22 20 5b |.c..y..y|..o+." [|
|00002630| 30 20 77 69 6e 64 6f 77 | 2d 77 69 64 74 68 20 73 |0 window|-width s|
|00002640| 65 6c 65 63 74 65 64 2d | 77 69 6e 64 6f 77 20 65 |elected-|window e|
|00002650| 64 69 66 66 2d 68 65 6c | 70 2d 6d 65 73 73 61 67 |diff-hel|p-messag|
|00002660| 65 2d 6c 69 6e 65 2d 6c | 65 6e 67 74 68 20 32 20 |e-line-l|ength 2 |
|00002670| 73 68 69 66 74 20 6d 61 | 6b 65 2d 73 74 72 69 6e |shift ma|ke-strin|
|00002680| 67 20 33 32 20 73 74 72 | 20 31 5d 20 33 5d 20 65 |g 32 str| 1] 3] e|
|00002690| 64 69 66 66 2d 73 65 74 | 2d 68 65 6c 70 2d 6d 65 |diff-set|-help-me|
|000026a0| 73 73 61 67 65 20 23 5b | 6e 69 6c 20 22 08 ab 8c |ssage #[|nil "...|
|000026b0| 08 39 ac 84 08 3a ab 84 | 08 20 aa ae 09 ab 86 5c |.9...:..|. .....\|
|000026c0| 6e 0b 0c 51 aa a5 0d ab | 87 5c 6e 0e 06 0c 51 aa |n..Q....|.\n...Q.|
|000026d0| 9b 0e 07 ab 87 5c 6e 0e | 08 0c 51 aa 90 0e 09 ab |.....\n.|..Q.....|
|000026e0| 87 5c 6e 0e 5c 6e 0c 51 | aa 85 5c 6e 0e 0b 0c 51 |.\n.\n.Q|..\n...Q|
|000026f0| 16 0c 0e 0d ab 8f 0e 0d | 39 ac 85 0e 0d 3a ab 85 |........|9....:..|
|00002700| 0e 0d 20 aa 97 0e 0d 3b | ab 84 0e 0d aa 8e ce 20 |.. ....;|....... |
|00002710| ab 88 0e 0f ab 84 0e 10 | aa 82 0e 10 16 11 0e 12 |........|........|
|00002720| ab 84 0e 0c aa 82 0e 11 | 16 13 d4 d5 21 87 22 20 |........|....!." |
|00002730| 5b 65 64 69 66 66 2d 6c | 6f 6e 67 2d 68 65 6c 70 |[ediff-l|ong-help|
|00002740| 2d 6d 65 73 73 61 67 65 | 2d 63 75 73 74 6f 6d 20 |-message|-custom |
|00002750| 65 64 69 66 66 2d 77 6f | 72 64 2d 6d 6f 64 65 20 |ediff-wo|rd-mode |
|00002760| 65 64 69 66 66 2d 6c 6f | 6e 67 2d 68 65 6c 70 2d |ediff-lo|ng-help-|
|00002770| 6d 65 73 73 61 67 65 2d | 68 65 61 64 20 65 64 69 |message-|head edi|
|00002780| 66 66 2d 6c 6f 6e 67 2d | 68 65 6c 70 2d 6d 65 73 |ff-long-|help-mes|
|00002790| 73 61 67 65 2d 77 6f 72 | 64 2d 6d 6f 64 65 20 65 |sage-wor|d-mode e|
|000027a0| 64 69 66 66 2d 6c 6f 6e | 67 2d 68 65 6c 70 2d 6d |diff-lon|g-help-m|
|000027b0| 65 73 73 61 67 65 2d 74 | 61 69 6c 20 65 64 69 66 |essage-t|ail edif|
|000027c0| 66 2d 6e 61 72 72 6f 77 | 2d 6a 6f 62 20 65 64 69 |f-narrow|-job edi|
|000027d0| 66 66 2d 6c 6f 6e 67 2d | 68 65 6c 70 2d 6d 65 73 |ff-long-|help-mes|
|000027e0| 73 61 67 65 2d 6e 61 72 | 72 6f 77 32 20 65 64 69 |sage-nar|row2 edi|
|000027f0| 66 66 2d 6d 65 72 67 65 | 2d 6a 6f 62 20 65 64 69 |ff-merge|-job edi|
|00002800| 66 66 2d 6c 6f 6e 67 2d | 68 65 6c 70 2d 6d 65 73 |ff-long-|help-mes|
|00002810| 73 61 67 65 2d 6d 65 72 | 67 65 20 65 64 69 66 66 |sage-mer|ge ediff|
|00002820| 2d 64 69 66 66 33 2d 6a | 6f 62 20 65 64 69 66 66 |-diff3-j|ob ediff|
|00002830| 2d 6c 6f 6e 67 2d 68 65 | 6c 70 2d 6d 65 73 73 61 |-long-he|lp-messa|
|00002840| 67 65 2d 63 6f 6d 70 61 | 72 65 33 20 65 64 69 66 |ge-compa|re3 edif|
|00002850| 66 2d 6c 6f 6e 67 2d 68 | 65 6c 70 2d 6d 65 73 73 |f-long-h|elp-mess|
|00002860| 61 67 65 2d 63 6f 6d 70 | 61 72 65 32 20 65 64 69 |age-comp|are2 edi|
|00002870| 66 66 2d 6c 6f 6e 67 2d | 68 65 6c 70 2d 6d 65 73 |ff-long-|help-mes|
|00002880| 73 61 67 65 20 65 64 69 | 66 66 2d 62 72 69 65 66 |sage edi|ff-brief|
|00002890| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 2d 63 75 |-help-me|ssage-cu|
|000028a0| 73 74 6f 6d 20 65 64 69 | 66 66 2d 77 69 6e 64 6f |stom edi|ff-windo|
|000028b0| 77 2d 64 69 73 70 6c 61 | 79 2d 70 20 65 64 69 66 |w-displa|y-p edif|
|000028c0| 66 2d 6d 75 6c 74 69 66 | 72 61 6d 65 20 65 64 69 |f-multif|rame edi|
|000028d0| 66 66 2d 62 72 69 65 66 | 2d 6d 65 73 73 61 67 65 |ff-brief|-message|
|000028e0| 2d 73 74 72 69 6e 67 20 | 65 64 69 66 66 2d 62 72 |-string |ediff-br|
|000028f0| 69 65 66 2d 68 65 6c 70 | 2d 6d 65 73 73 61 67 65 |ief-help|-message|
|00002900| 20 65 64 69 66 66 2d 70 | 72 65 66 65 72 2d 6c 6f | ediff-p|refer-lo|
|00002910| 6e 67 2d 68 65 6c 70 2d | 6d 65 73 73 61 67 65 20 |ng-help-|message |
|00002920| 65 64 69 66 66 2d 68 65 | 6c 70 2d 6d 65 73 73 61 |ediff-he|lp-messa|
|00002930| 67 65 20 72 75 6e 2d 68 | 6f 6f 6b 73 20 65 64 69 |ge run-h|ooks edi|
|00002940| 66 66 2d 64 69 73 70 6c | 61 79 2d 68 65 6c 70 2d |ff-displ|ay-help-|
|00002950| 68 6f 6f 6b 73 5d 20 33 | 5d 5d 20 32 29 0a 28 66 |hooks] 3|]] 2).(f|
|00002960| 73 65 74 20 27 65 64 69 | 66 66 2d 75 70 64 61 74 |set 'edi|ff-updat|
|00002970| 65 2d 64 69 66 66 73 20 | 23 5b 6e 69 6c 20 22 08 |e-diffs |#[nil ".|
|00002980| ab 95 c1 08 21 ab 90 c2 | c1 08 21 21 ab 89 c3 c4 |....!...|..!!....|
|00002990| 21 ac 84 c5 c6 21 88 70 | 1e 07 0e 08 ab 98 c1 0e |!....!.p|........|
|000029a0| 08 21 ab 92 c2 c1 0e 08 | 21 21 ab 8a c9 8e 0e 08 |.!......|!!......|
|000029b0| 71 88 60 29 aa 89 0e 5c | 6e cb 3d ae 83 c5 cc 21 |q.`)...\|n.=....!|
|000029c0| 29 cd 0e 0e 21 cf d0 0e | 08 21 ae 84 c2 0e 08 21 |)...!...|.!.....!|
|000029d0| 21 cf d0 0e 11 21 ae 84 | c2 0e 11 21 21 cf d0 0e |!....!..|...!!...|
|000029e0| 12 21 ae 84 c2 0e 12 21 | 21 0e 13 40 0e 13 41 40 |.!.....!|!..@..A@|
|000029f0| d4 0e 13 38 d5 89 89 89 | 89 89 89 89 89 1e 16 1e |...8....|........|
|00002a00| 17 1e 18 1e 19 1e 1a 1e | 1b 1e 1c 1e 1d 1e 1e 1e |........|........|
|00002a10| 1f 1e 20 1e 21 1e 5c 22 | 1e 23 1e 24 1e 25 1e 26 |.. .!.\"|.#.$.%.&|
|00002a20| e7 e8 21 88 0e 21 1e 29 | ea 0e 29 21 ad 8e 0e 2b |..!..!.)|..)!...+|
|00002a30| ab 86 ec 0e 29 21 aa 84 | ed 0e 29 21 29 16 1e 0e |....)!..|..)!)...|
|00002a40| 20 1e 29 ea 0e 29 21 ad | 8e 0e 2b ab 86 ec 0e 29 | .)..)!.|..+....)|
|00002a50| 21 aa 84 ed 0e 29 21 29 | 16 1c 0e 1f 1e 29 ea 0e |!....)!)|.....)..|
|00002a60| 29 21 ad 8e 0e 2b ab 86 | ec 0e 29 21 aa 84 ed 0e |)!...+..|..)!....|
|00002a70| 29 21 29 16 1a 0e 21 1e | 29 ea 0e 29 21 ad 8e 0e |)!)...!.|)..)!...|
|00002a80| 2b ab 86 ee 0e 29 21 aa | 84 ef 0e 29 21 29 16 1d |+....)!.|...)!)..|
|00002a90| 0e 20 1e 29 ea 0e 29 21 | ad 8e 0e 2b ab 86 ee 0e |. .)..)!|...+....|
|00002aa0| 29 21 aa 84 ef 0e 29 21 | 29 16 1b 0e 1f 1e 29 ea |)!....)!|).....).|
|00002ab0| 0e 29 21 ad 8e 0e 2b ab | 86 ee 0e 29 21 aa 84 ef |.)!...+.|...)!...|
|00002ac0| 0e 29 21 29 16 19 0e 30 | ab bc f1 0e 1e 0e 1d 0e |.)!)...0|........|
|00002ad0| 08 0e 25 24 88 f2 0e 25 | f3 5c 22 16 18 f1 0e 1c |..%$...%|.\".....|
|00002ae0| 0e 1b 0e 11 0e 25 24 88 | f2 0e 25 f4 5c 22 16 17 |.....%$.|..%.\"..|
|00002af0| 0e 35 ab b0 f1 0e 1a 0e | 19 0e 12 0e 25 24 88 f2 |.5......|....%$..|
|00002b00| 0e 25 f6 5c 22 16 16 aa | 9c f2 0e 08 0e 24 5c 22 |.%.\"...|.....$\"|
|00002b10| 16 18 f2 0e 11 0e 23 5c | 22 16 17 0e 35 ab 88 f2 |......#\|"...5...|
|00002b20| 0e 12 0e 5c 22 5c 22 16 | 16 f7 f8 f9 5c 22 88 f7 |...\"\".|....\"..|
|00002b30| fa f9 5c 22 88 f7 fb f9 | 5c 22 88 f7 fc f9 5c 22 |..\"....|\"....\"|
|00002b40| 88 d5 16 3c d5 10 d5 16 | 3d d5 16 3e 0e 3f 0e 40 |...<....|=..>.?.@|
|00002b50| 0e 41 0e 42 0e 43 1e 43 | 1e 42 1e 41 1e 40 1e 3f |.A.B.C.C|.B.A.@.?|
|00002b60| 0e 41 ab 95 81 44 00 16 | 3f 81 45 00 16 40 d5 16 |.A...D..|?.E..@..|
|00002b70| 41 d5 16 42 81 46 00 16 | 43 0e 3f 0e 18 0e 17 0e |A..B.F..|C.?.....|
|00002b80| 16 23 88 2d 0e 38 47 16 | 47 81 48 00 0e 18 21 88 |.#.-.8G.|G.H...!.|
|00002b90| 81 48 00 0e 17 21 88 0e | 16 ab 87 81 48 00 0e 16 |.H...!..|....H...|
|00002ba0| 21 88 0e 35 ab a3 0e 49 | 1e 4a 81 4b 00 1e 4c 81 |!..5...I|.J.K..L.|
|00002bb0| 4b 00 0e 47 57 ab 91 81 | 4d 00 0e 4c 0e 4a 5c 22 |K..GW...|M..L.J\"|
|00002bc0| 88 0e 4c 54 89 16 4c aa | 6a 2a 81 4e 00 81 4f 00 |..LT..L.|j*.N..O.|
|00002bd0| 81 50 00 0e 26 5c 22 21 | 88 81 51 00 81 52 00 21 |.P..&\"!|..Q..R.!|
|00002be0| 2e 11 87 22 20 5b 65 64 | 69 66 66 2d 61 6e 63 65 |..." [ed|iff-ance|
|00002bf0| 73 74 6f 72 2d 62 75 66 | 66 65 72 20 67 65 74 2d |stor-buf|fer get-|
|00002c00| 62 75 66 66 65 72 20 62 | 75 66 66 65 72 2d 6e 61 |buffer b|uffer-na|
|00002c10| 6d 65 20 79 2d 6f 72 2d | 6e 2d 70 20 22 52 65 63 |me y-or-|n-p "Rec|
|00002c20| 6f 6d 70 75 74 65 20 64 | 69 66 66 65 72 65 6e 63 |ompute d|ifferenc|
|00002c30| 65 73 20 64 75 72 69 6e | 67 20 6d 65 72 67 65 2c |es durin|g merge,|
|00002c40| 20 72 65 61 6c 6c 79 3f | 20 22 20 65 72 72 6f 72 | really?| " error|
|00002c50| 20 22 47 6f 64 20 66 6f | 72 62 69 64 21 22 20 53 | "God fo|rbid!" S|
|00002c60| 74 61 72 74 42 75 66 66 | 65 72 20 65 64 69 66 66 |tartBuff|er ediff|
|00002c70| 2d 62 75 66 66 65 72 2d | 41 20 28 28 73 65 74 2d |-buffer-|A ((set-|
|00002c80| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00002c90| 65 72 29 29 20 74 68 69 | 73 2d 63 6f 6d 6d 61 6e |er)) thi|s-comman|
|00002ca0| 64 20 65 64 69 66 66 2d | 71 75 69 74 20 22 59 6f |d ediff-|quit "Yo|
|00002cb0| 75 27 76 65 20 6b 69 6c | 6c 65 64 20 61 6e 20 65 |u've kil|led an e|
|00002cc0| 73 73 65 6e 74 69 61 6c | 20 45 64 69 66 66 20 62 |ssential| Ediff b|
|00002cd0| 75 66 66 65 72 2d 2d 2d | 50 6c 65 61 73 65 20 71 |uffer---|Please q|
|00002ce0| 75 69 74 20 45 64 69 66 | 66 22 20 67 65 74 2d 62 |uit Edif|f" get-b|
|00002cf0| 75 66 66 65 72 2d 63 72 | 65 61 74 65 20 65 64 69 |uffer-cr|eate edi|
|00002d00| 66 66 2d 74 6d 70 2d 62 | 75 66 66 65 72 20 66 69 |ff-tmp-b|uffer fi|
|00002d10| 6c 65 2d 6e 61 6d 65 2d | 6e 6f 6e 64 69 72 65 63 |le-name-|nondirec|
|00002d20| 74 6f 72 79 20 62 75 66 | 66 65 72 2d 66 69 6c 65 |tory buf|fer-file|
|00002d30| 2d 6e 61 6d 65 20 65 64 | 69 66 66 2d 62 75 66 66 |-name ed|iff-buff|
|00002d40| 65 72 2d 42 20 65 64 69 | 66 66 2d 62 75 66 66 65 |er-B edi|ff-buffe|
|00002d50| 72 2d 43 20 65 64 69 66 | 66 2d 6e 61 72 72 6f 77 |r-C edif|f-narrow|
|00002d60| 2d 62 6f 75 6e 64 73 20 | 32 20 6e 69 6c 20 66 69 |-bounds |2 nil fi|
|00002d70| 6c 65 2d 43 20 66 69 6c | 65 2d 42 20 66 69 6c 65 |le-C fil|e-B file|
|00002d80| 2d 41 20 65 6e 64 2d 43 | 20 62 65 67 2d 43 20 65 |-A end-C| beg-C e|
|00002d90| 6e 64 2d 42 20 62 65 67 | 2d 42 20 65 6e 64 2d 41 |nd-B beg|-B end-A|
|00002da0| 20 62 65 67 2d 41 20 6f | 76 65 72 6c 2d 43 20 6f | beg-A o|verl-C o|
|00002db0| 76 65 72 6c 2d 42 20 6f | 76 65 72 6c 2d 41 20 62 |verl-B o|verl-A b|
|00002dc0| 75 66 2d 43 2d 66 69 6c | 65 2d 6e 61 6d 65 20 62 |uf-C-fil|e-name b|
|00002dd0| 75 66 2d 42 2d 66 69 6c | 65 2d 6e 61 6d 65 20 62 |uf-B-fil|e-name b|
|00002de0| 75 66 2d 41 2d 66 69 6c | 65 2d 6e 61 6d 65 20 74 |uf-A-fil|e-name t|
|00002df0| 6d 70 2d 62 75 66 66 65 | 72 20 70 6f 69 6e 74 2d |mp-buffe|r point-|
|00002e00| 41 20 65 64 69 66 66 2d | 75 6e 73 65 6c 65 63 74 |A ediff-|unselect|
|00002e10| 2d 61 6e 64 2d 73 65 6c | 65 63 74 2d 64 69 66 66 |-and-sel|ect-diff|
|00002e20| 65 72 65 6e 63 65 20 2d | 31 20 6f 76 65 72 6c 20 |erence -|1 overl |
|00002e30| 65 64 69 66 66 2d 6f 76 | 65 72 6c 61 79 70 20 65 |ediff-ov|erlayp e|
|00002e40| 64 69 66 66 2d 65 6d 61 | 63 73 2d 70 20 6f 76 65 |diff-ema|cs-p ove|
|00002e50| 72 6c 61 79 2d 73 74 61 | 72 74 20 65 78 74 65 6e |rlay-sta|rt exten|
|00002e60| 74 2d 73 74 61 72 74 2d | 70 6f 73 69 74 69 6f 6e |t-start-|position|
|00002e70| 20 6f 76 65 72 6c 61 79 | 2d 65 6e 64 20 65 78 74 | overlay|-end ext|
|00002e80| 65 6e 74 2d 65 6e 64 2d | 70 6f 73 69 74 69 6f 6e |ent-end-|position|
|00002e90| 20 65 64 69 66 66 2d 77 | 6f 72 64 2d 6d 6f 64 65 | ediff-w|ord-mode|
|00002ea0| 20 65 64 69 66 66 2d 77 | 6f 72 64 69 66 79 20 65 | ediff-w|ordify e|
|00002eb0| 64 69 66 66 2d 6d 61 6b | 65 2d 74 65 6d 70 2d 66 |diff-mak|e-temp-f|
|00002ec0| 69 6c 65 20 22 72 65 67 | 41 22 20 22 72 65 67 42 |ile "reg|A" "regB|
|00002ed0| 22 20 65 64 69 66 66 2d | 33 77 61 79 2d 6a 6f 62 |" ediff-|3way-job|
|00002ee0| 20 22 72 65 67 43 22 20 | 65 64 69 66 66 2d 63 6c | "regC" |ediff-cl|
|00002ef0| 65 61 72 2d 64 69 66 66 | 2d 76 65 63 74 6f 72 20 |ear-diff|-vector |
|00002f00| 65 64 69 66 66 2d 64 69 | 66 66 65 72 65 6e 63 65 |ediff-di|fference|
|00002f10| 2d 76 65 63 74 6f 72 2d | 41 20 66 69 6e 65 2d 64 |-vector-|A fine-d|
|00002f20| 69 66 66 73 2d 61 6c 73 | 6f 20 65 64 69 66 66 2d |iffs-als|o ediff-|
|00002f30| 64 69 66 66 65 72 65 6e | 63 65 2d 76 65 63 74 6f |differen|ce-vecto|
|00002f40| 72 2d 42 20 65 64 69 66 | 66 2d 64 69 66 66 65 72 |r-B edif|f-differ|
|00002f50| 65 6e 63 65 2d 76 65 63 | 74 6f 72 2d 43 20 65 64 |ence-vec|tor-C ed|
|00002f60| 69 66 66 2d 64 69 66 66 | 65 72 65 6e 63 65 2d 76 |iff-diff|erence-v|
|00002f70| 65 63 74 6f 72 2d 41 6e | 63 65 73 74 6f 72 20 65 |ector-An|cestor e|
|00002f80| 64 69 66 66 2d 73 74 61 | 74 65 2d 6f 66 2d 6d 65 |diff-sta|te-of-me|
|00002f90| 72 67 65 20 65 64 69 66 | 66 2d 6b 69 6c 6c 65 64 |rge edif|f-killed|
|00002fa0| 2d 64 69 66 66 73 2d 61 | 6c 69 73 74 20 65 64 69 |-diffs-a|list edi|
|00002fb0| 66 66 2d 73 65 74 75 70 | 2d 64 69 66 66 2d 72 65 |ff-setup|-diff-re|
|00002fc0| 67 69 6f 6e 73 2d 66 75 | 6e 63 74 69 6f 6e 20 65 |gions-fu|nction e|
|00002fd0| 64 69 66 66 2d 33 77 61 | 79 2d 63 6f 6d 70 61 72 |diff-3wa|y-compar|
|00002fe0| 69 73 6f 6e 2d 6a 6f 62 | 20 65 64 69 66 66 2d 6d |ison-job| ediff-m|
|00002ff0| 65 72 67 65 2d 6a 6f 62 | 20 65 64 69 66 66 2d 6d |erge-job| ediff-m|
|00003000| 65 72 67 65 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |erge-wit|h-ancest|
|00003010| 6f 72 2d 6a 6f 62 20 65 | 64 69 66 66 2d 6a 6f 62 |or-job e|diff-job|
|00003020| 2d 6e 61 6d 65 20 65 64 | 69 66 66 2d 73 65 74 75 |-name ed|iff-setu|
|00003030| 70 2d 64 69 66 66 2d 72 | 65 67 69 6f 6e 73 33 20 |p-diff-r|egions3 |
|00003040| 74 20 65 64 69 66 66 2d | 66 69 6c 65 73 33 20 65 |t ediff-|files3 e|
|00003050| 64 69 66 66 2d 6e 75 6d | 62 65 72 2d 6f 66 2d 64 |diff-num|ber-of-d|
|00003060| 69 66 66 65 72 65 6e 63 | 65 73 20 64 65 6c 65 74 |ifferenc|es delet|
|00003070| 65 2d 66 69 6c 65 20 65 | 64 69 66 66 2d 63 6f 6e |e-file e|diff-con|
|00003080| 74 72 6f 6c 2d 62 75 66 | 66 65 72 20 63 74 6c 2d |trol-buf|fer ctl-|
|00003090| 62 75 66 20 30 20 6e 20 | 65 64 69 66 66 2d 73 65 |buf 0 n |ediff-se|
|000030a0| 74 2d 73 74 61 74 65 2d | 6f 66 2d 64 69 66 66 2d |t-state-|of-diff-|
|000030b0| 69 6e 2d 61 6c 6c 2d 62 | 75 66 66 65 72 73 20 65 |in-all-b|uffers e|
|000030c0| 64 69 66 66 2d 6a 75 6d | 70 2d 74 6f 2d 64 69 66 |diff-jum|p-to-dif|
|000030d0| 66 65 72 65 6e 63 65 20 | 65 64 69 66 66 2d 64 69 |ference |ediff-di|
|000030e0| 66 66 2d 61 74 2d 70 6f | 69 6e 74 20 41 20 6d 65 |ff-at-po|int A me|
|000030f0| 73 73 61 67 65 20 22 22 | 5d 20 31 38 20 22 5c 0a |ssage ""|] 18 "\.|
|00003100| 52 65 63 6f 6d 70 75 74 | 65 20 64 69 66 66 65 72 |Recomput|e differ|
|00003110| 65 6e 63 65 20 72 65 67 | 69 6f 6e 73 20 69 6e 20 |ence reg|ions in |
|00003120| 62 75 66 66 65 72 73 20 | 41 2c 20 42 2c 20 61 6e |buffers |A, B, an|
|00003130| 64 20 43 2e 0a 42 75 66 | 66 65 72 73 20 61 72 65 |d C..Buf|fers are|
|00003140| 20 6e 6f 74 20 73 79 6e | 63 68 72 6f 6e 69 7a 65 | not syn|chronize|
|00003150| 64 20 77 69 74 68 20 74 | 68 65 69 72 20 72 65 73 |d with t|heir res|
|00003160| 70 65 63 74 69 76 65 20 | 66 69 6c 65 73 2c 20 73 |pective |files, s|
|00003170| 6f 20 63 68 61 6e 67 65 | 73 20 64 6f 6e 65 0a 74 |o change|s done.t|
|00003180| 6f 20 74 68 65 73 65 20 | 62 75 66 66 65 72 73 20 |o these |buffers |
|00003190| 61 72 65 20 6e 6f 74 20 | 73 61 76 65 64 20 61 74 |are not |saved at|
|000031a0| 20 74 68 69 73 20 70 6f | 69 6e 74 2d 2d 2d 74 68 | this po|int---th|
|000031b0| 65 20 75 73 65 72 20 63 | 61 6e 20 64 6f 20 74 68 |e user c|an do th|
|000031c0| 69 73 20 6c 61 74 65 72 | 2c 0a 69 66 20 6e 65 63 |is later|,.if nec|
|000031d0| 65 73 73 61 72 79 2e 22 | 20 6e 69 6c 5d 29 0a 28 |essary."| nil]).(|
|000031e0| 66 73 65 74 20 27 65 64 | 69 66 66 2d 72 65 76 65 |fset 'ed|iff-reve|
|000031f0| 72 74 2d 62 75 66 66 65 | 72 73 2d 74 68 65 6e 2d |rt-buffe|rs-then-|
|00003200| 72 65 63 6f 6d 70 75 74 | 65 2d 64 69 66 66 73 20 |recomput|e-diffs |
|00003210| 23 5b 28 6e 6f 63 6f 6e | 66 69 72 6d 29 20 22 08 |#[(nocon|firm) ".|
|00003220| 09 5c 6e 0b 0c 0d 0e 06 | 0e 07 0e 08 1e 09 1e 5c |.\n.....|.......\|
|00003230| 6e 1e 0b 1e 0c 1e 0d 1e | 0e 1e 0f 1e 10 1e 11 70 |n.......|.......p|
|00003240| 1e 12 0e 11 ab 9d d3 0e | 11 21 ab 97 d4 d3 0e 11 |........|.!......|
|00003250| 21 21 ab 8f d5 8e 0e 11 | 71 88 d6 d7 0e 18 5c 22 |!!......|q.....\"|
|00003260| 88 29 aa 8a 0e 19 da 3d | ac 84 db dc 21 88 29 70 |.).....=|....!.)p|
|00003270| 1e 12 0e 10 ab 9d d3 0e | 10 21 ab 97 d4 d3 0e 10 |........|.!......|
|00003280| 21 21 ab 8f dd 8e 0e 10 | 71 88 d6 d7 0e 18 5c 22 |!!......|q.....\"|
|00003290| 88 29 aa 8a 0e 19 da 3d | ac 84 db dc 21 88 29 0e |.).....=|....!.).|
|000032a0| 09 ab af 70 1e 12 0e 0f | ab 9d d3 0e 0f 21 ab 97 |...p....|.....!..|
|000032b0| d4 d3 0e 0f 21 21 ab 8f | de 8e 0e 0f 71 88 d6 d7 |....!!..|....q...|
|000032c0| 0e 18 5c 22 88 29 aa 8a | 0e 19 da 3d ac 84 db dc |..\".)..|...=....|
|000032d0| 21 88 29 0e 5c 6e ab a5 | 0e 0e 71 88 df 0e 0d 3f |!.).\n..|..q....?|
|000032e0| 21 88 e0 0e 0f 21 88 0e | 0b ab 8a e1 0e 11 0e 10 |!....!..|........|
|000032f0| 0e 0c 23 aa 8a e2 0e 11 | 0e 10 5c 22 aa 82 e3 20 |..#.....|..\"... |
|00003300| 2e 09 87 22 20 5b 65 64 | 69 66 66 2d 62 75 66 66 |..." [ed|iff-buff|
|00003310| 65 72 2d 41 20 65 64 69 | 66 66 2d 62 75 66 66 65 |er-A edi|ff-buffe|
|00003320| 72 2d 42 20 65 64 69 66 | 66 2d 62 75 66 66 65 72 |r-B edif|f-buffer|
|00003330| 2d 43 20 65 64 69 66 66 | 2d 63 6f 6e 74 72 6f 6c |-C ediff|-control|
|00003340| 2d 62 75 66 66 65 72 20 | 65 64 69 66 66 2d 6b 65 |-buffer |ediff-ke|
|00003350| 65 70 2d 76 61 72 69 61 | 6e 74 73 20 65 64 69 66 |ep-varia|nts edif|
|00003360| 66 2d 61 6e 63 65 73 74 | 6f 72 2d 62 75 66 66 65 |f-ancest|or-buffe|
|00003370| 72 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 77 69 |r ediff-|merge-wi|
|00003380| 74 68 2d 61 6e 63 65 73 | 74 6f 72 2d 6a 6f 62 20 |th-ances|tor-job |
|00003390| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 6a 6f 62 20 |ediff-me|rge-job |
|000033a0| 65 64 69 66 66 2d 33 77 | 61 79 2d 63 6f 6d 70 61 |ediff-3w|ay-compa|
|000033b0| 72 69 73 6f 6e 2d 6a 6f | 62 20 63 6f 6d 70 61 72 |rison-jo|b compar|
|000033c0| 69 73 6f 6e 20 6d 65 72 | 67 65 20 61 6e 63 65 73 |ison mer|ge ances|
|000033d0| 74 6f 72 2d 6a 6f 62 20 | 61 6e 63 65 73 74 6f 72 |tor-job |ancestor|
|000033e0| 2d 62 75 66 20 6b 65 65 | 70 2d 76 61 72 69 61 6e |-buf kee|p-varian|
|000033f0| 74 73 20 63 74 6c 2d 62 | 75 66 20 62 75 66 43 20 |ts ctl-b|uf bufC |
|00003400| 62 75 66 42 20 62 75 66 | 41 20 53 74 61 72 74 42 |bufB buf|A StartB|
|00003410| 75 66 66 65 72 20 67 65 | 74 2d 62 75 66 66 65 72 |uffer ge|t-buffer|
|00003420| 20 62 75 66 66 65 72 2d | 6e 61 6d 65 20 28 28 73 | buffer-|name ((s|
|00003430| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|00003440| 75 66 66 65 72 29 29 20 | 72 65 76 65 72 74 2d 62 |uffer)) |revert-b|
|00003450| 75 66 66 65 72 20 74 20 | 6e 6f 63 6f 6e 66 69 72 |uffer t |noconfir|
|00003460| 6d 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 65 |m this-c|ommand e|
|00003470| 64 69 66 66 2d 71 75 69 | 74 20 65 72 72 6f 72 20 |diff-qui|t error |
|00003480| 22 59 6f 75 27 76 65 20 | 6b 69 6c 6c 65 64 20 61 |"You've |killed a|
|00003490| 6e 20 65 73 73 65 6e 74 | 69 61 6c 20 45 64 69 66 |n essent|ial Edif|
|000034a0| 66 20 62 75 66 66 65 72 | 2d 2d 2d 50 6c 65 61 73 |f buffer|---Pleas|
|000034b0| 65 20 71 75 69 74 20 45 | 64 69 66 66 22 20 28 28 |e quit E|diff" ((|
|000034c0| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|000034d0| 42 75 66 66 65 72 29 29 | 20 28 28 73 65 74 2d 62 |Buffer))| ((set-b|
|000034e0| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|000034f0| 72 29 29 20 65 64 69 66 | 66 2d 72 65 61 6c 6c 79 |r)) edif|f-really|
|00003500| 2d 71 75 69 74 20 6b 69 | 6c 6c 2d 62 75 66 66 65 |-quit ki|ll-buffe|
|00003510| 72 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 62 75 |r ediff-|merge-bu|
|00003520| 66 66 65 72 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |ffers-wi|th-ances|
|00003530| 74 6f 72 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |tor edif|f-merge-|
|00003540| 62 75 66 66 65 72 73 20 | 65 64 69 66 66 2d 75 70 |buffers |ediff-up|
|00003550| 64 61 74 65 2d 64 69 66 | 66 73 5d 20 39 20 22 5c |date-dif|fs] 9 "\|
|00003560| 0a 52 65 76 65 72 74 20 | 62 75 66 66 65 72 73 20 |.Revert |buffers |
|00003570| 41 2c 20 42 20 61 6e 64 | 20 43 2e 20 54 68 65 6e |A, B and| C. Then|
|00003580| 20 72 65 72 75 6e 20 45 | 64 69 66 66 20 6f 6e 20 | rerun E|diff on |
|00003590| 66 69 6c 65 20 41 20 61 | 6e 64 20 66 69 6c 65 20 |file A a|nd file |
|000035a0| 42 2e 22 20 22 50 22 5d | 29 0a 28 66 73 65 74 20 |B." "P"]|).(fset |
|000035b0| 27 65 64 69 66 66 2d 72 | 65 63 65 6e 74 65 72 20 |'ediff-r|ecenter |
|000035c0| 23 5b 28 26 6f 70 74 69 | 6f 6e 61 6c 20 6e 6f 2d |#[(&opti|onal no-|
|000035d0| 72 65 68 69 67 68 6c 69 | 67 68 74 29 20 22 08 ab |rehighli|ght) "..|
|000035e0| 85 09 ab 82 c2 13 c4 15 | c4 1e 06 0e 07 ab c3 c8 |........|........|
|000035f0| 0e 07 21 ab bd c9 c8 0e | 07 21 21 ab b5 0e 5c 6e |..!.....|.!!...\n|
|00003600| ab b1 c8 0e 5c 6e 21 ab | ab c9 c8 0e 5c 6e 21 21 |....\n!.|....\n!!|
|00003610| ab a3 0e 0b ab 92 0e 0c | ab 9b c8 0e 0c 21 ab 95 |........|.....!..|
|00003620| c9 c8 0e 0c 21 21 ab 8d | cd 0e 07 0e 5c 6e 0e 0c |....!!..|....\n..|
|00003630| 0e 0e 24 88 aa 8d 0e 0f | d0 3d ac 87 d1 d2 d3 d4 |..$.....|.=......|
|00003640| 21 5c 22 88 29 d5 20 88 | d6 20 ab cc d6 20 d7 3e |!\".). .|. ... .>|
|00003650| ac c6 0e 0f 39 ab c1 0e | 18 39 ab bc 0e 0f d9 3e |....9...|.9.....>|
|00003660| ac 8f 0e 0f da 3e ab b0 | db dc dd 0e 18 21 5c 22 |.....>..|.....!\"|
|00003670| ac a7 de 0e 1f 21 ab 87 | e0 e1 0e 1f 21 21 88 de |.....!..|....!!..|
|00003680| 0e 5c 22 21 ab 87 e0 e1 | 0e 5c 22 21 21 88 de 0e |.\"!....|.\"!!...|
|00003690| 23 21 ab 87 e0 e1 0e 23 | 21 21 88 d6 20 ab b5 d6 |#!.....#|!!.. ...|
|000036a0| 20 d7 3e ac af e4 0e 25 | 21 ab a9 0e 26 ac a5 0e | .>....%|!...&...|
|000036b0| 25 1e 27 e8 20 ad 95 e4 | 0e 27 21 ad 8f 08 ab 86 |%.'. ...|.'!.....|
|000036c0| e9 0e 27 21 aa 86 ea 0e | 27 21 eb 3d 29 ac 85 e0 |..'!....|'!.=)...|
|000036d0| 0e 25 21 88 0e 25 1e 2c | 0e 0e 1e 2d 0e 07 83 ad |.%!..%.,|...-....|
|000036e0| 01 c8 0e 07 21 83 ad 01 | c9 c8 0e 07 21 21 83 ad |....!...|....!!..|
|000036f0| 01 0e 5c 6e 83 ad 01 c8 | 0e 5c 6e 21 83 ad 01 c9 |..\n....|.\n!....|
|00003700| c8 0e 5c 6e 21 21 83 ad | 01 0e 0b ab 93 0e 0c 83 |..\n!!..|........|
|00003710| ad 01 c8 0e 0c 21 ab fe | c9 c8 0e 0c 21 21 ab f6 |.....!..|....!!..|
|00003720| 0e 2e ac 85 ef 0e 30 21 | 88 f1 f2 21 88 f1 f3 21 |......0!|...!...!|
|00003730| 88 0e 0b ab 84 f1 f4 21 | 88 70 1e 35 0e 2d ab cb |.......!|.p.5.-..|
|00003740| c8 0e 2d 21 ab c5 c9 c8 | 0e 2d 21 21 ab bd f6 8e |..-!....|.-!!....|
|00003750| 0e 2d 71 88 f7 20 88 e8 | 20 ab ad 0e 38 ab a9 0e |.-q.. ..| ...8...|
|00003760| 26 ac a5 0e 25 1e 27 e8 | 20 ad 95 e4 0e 27 21 ad |&...%.'.| ....'!.|
|00003770| 8f 08 ab 86 e9 0e 27 21 | aa 86 ea 0e 27 21 eb 3d |......'!|....'!.=|
|00003780| 29 ac 85 f9 0e 2c 21 88 | 29 aa 8a 0e 0f d0 3d ac |)....,!.|).....=.|
|00003790| 84 fa d2 21 88 29 70 1e | 35 0e 2d ab 99 c8 0e 2d |...!.)p.|5.-....-|
|000037a0| 21 ab 93 c9 c8 0e 2d 21 | 21 ab 8b fb 8e 0e 2d 71 |!.....-!|!.....-q|
|000037b0| 88 fc 20 29 aa 89 0e 0f | d0 3d ae 83 fa d2 21 2b |.. )....|.=....!+|
|000037c0| 87 22 20 5b 65 64 69 66 | 66 2d 78 65 6d 61 63 73 |." [edif|f-xemacs|
|000037d0| 2d 70 20 65 64 69 66 66 | 2d 73 79 6e 63 68 72 6f |-p ediff|-synchro|
|000037e0| 6e 69 7a 65 2d 6d 69 6e | 69 62 75 66 66 65 72 73 |nize-min|ibuffers|
|000037f0| 20 74 20 73 79 6e 63 68 | 72 6f 6e 69 7a 65 2d 6d | t synch|ronize-m|
|00003800| 69 6e 69 62 75 66 66 65 | 72 73 20 6e 69 6c 20 65 |inibuffe|rs nil e|
|00003810| 64 69 66 66 2d 64 69 73 | 74 75 72 62 65 64 2d 6f |diff-dis|turbed-o|
|00003820| 76 65 72 6c 61 79 73 20 | 62 75 66 66 65 72 2d 72 |verlays |buffer-r|
|00003830| 65 61 64 2d 6f 6e 6c 79 | 20 65 64 69 66 66 2d 62 |ead-only| ediff-b|
|00003840| 75 66 66 65 72 2d 41 20 | 67 65 74 2d 62 75 66 66 |uffer-A |get-buff|
|00003850| 65 72 20 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 65 |er buffe|r-name e|
|00003860| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 42 20 65 64 |diff-buf|fer-B ed|
|00003870| 69 66 66 2d 33 77 61 79 | 2d 6a 6f 62 20 65 64 69 |iff-3way|-job edi|
|00003880| 66 66 2d 62 75 66 66 65 | 72 2d 43 20 65 64 69 66 |ff-buffe|r-C edif|
|00003890| 66 2d 73 65 74 75 70 2d | 77 69 6e 64 6f 77 73 20 |f-setup-|windows |
|000038a0| 65 64 69 66 66 2d 63 6f | 6e 74 72 6f 6c 2d 62 75 |ediff-co|ntrol-bu|
|000038b0| 66 66 65 72 20 74 68 69 | 73 2d 63 6f 6d 6d 61 6e |ffer thi|s-comman|
|000038c0| 64 20 65 64 69 66 66 2d | 71 75 69 74 20 6d 65 73 |d ediff-|quit mes|
|000038d0| 73 61 67 65 20 22 59 6f | 75 27 76 65 20 6b 69 6c |sage "Yo|u've kil|
|000038e0| 6c 65 64 20 61 6e 20 65 | 73 73 65 6e 74 69 61 6c |led an e|ssential|
|000038f0| 20 45 64 69 66 66 20 62 | 75 66 66 65 72 2d 2d 2d | Ediff b|uffer---|
|00003900| 50 6c 65 61 73 65 20 71 | 75 69 74 20 45 64 69 66 |Please q|uit Edif|
|00003910| 66 22 20 62 65 65 70 20 | 31 20 65 64 69 66 66 2d |f" beep |1 ediff-|
|00003920| 76 69 73 69 62 6c 65 2d | 72 65 67 69 6f 6e 20 65 |visible-|region e|
|00003930| 64 69 66 66 2d 64 65 76 | 69 63 65 2d 74 79 70 65 |diff-dev|ice-type|
|00003940| 20 28 74 74 79 20 73 74 | 72 65 61 6d 29 20 6c 61 | (tty st|ream) la|
|00003950| 73 74 2d 63 6f 6d 6d 61 | 6e 64 20 28 65 64 69 66 |st-comma|nd (edif|
|00003960| 66 2d 72 65 63 65 6e 74 | 65 72 20 65 64 69 66 66 |f-recent|er ediff|
|00003970| 2d 64 69 72 2d 61 63 74 | 69 6f 6e 20 65 64 69 66 |-dir-act|ion edif|
|00003980| 66 2d 72 65 67 69 73 74 | 72 79 2d 61 63 74 69 6f |f-regist|ry-actio|
|00003990| 6e 20 65 64 69 66 66 2d | 70 61 74 63 68 2d 61 63 |n ediff-|patch-ac|
|000039a0| 74 69 6f 6e 20 65 64 69 | 66 66 2d 74 6f 67 67 6c |tion edi|ff-toggl|
|000039b0| 65 2d 77 69 64 65 2d 64 | 69 73 70 6c 61 79 20 65 |e-wide-d|isplay e|
|000039c0| 64 69 66 66 2d 74 6f 67 | 67 6c 65 2d 6d 75 6c 74 |diff-tog|gle-mult|
|000039d0| 69 66 72 61 6d 65 29 20 | 28 65 64 69 66 66 2d 6e |iframe) |(ediff-n|
|000039e0| 65 78 74 2d 64 69 66 66 | 65 72 65 6e 63 65 20 65 |ext-diff|erence e|
|000039f0| 64 69 66 66 2d 70 72 65 | 76 69 6f 75 73 2d 64 69 |diff-pre|vious-di|
|00003a00| 66 66 65 72 65 6e 63 65 | 20 65 64 69 66 66 2d 6a |fference| ediff-j|
|00003a10| 75 6d 70 2d 74 6f 2d 64 | 69 66 66 65 72 65 6e 63 |ump-to-d|ifferenc|
|00003a20| 65 20 65 64 69 66 66 2d | 6a 75 6d 70 2d 74 6f 2d |e ediff-|jump-to-|
|00003a30| 64 69 66 66 65 72 65 6e | 63 65 2d 61 74 2d 70 6f |differen|ce-at-po|
|00003a40| 69 6e 74 29 20 73 74 72 | 69 6e 67 2d 6d 61 74 63 |int) str|ing-matc|
|00003a50| 68 20 22 5e 65 64 69 66 | 66 2d 22 20 73 79 6d 62 |h "^edif|f-" symb|
|00003a60| 6f 6c 2d 6e 61 6d 65 20 | 77 69 6e 64 6f 77 2d 6c |ol-name |window-l|
|00003a70| 69 76 65 2d 70 20 65 64 | 69 66 66 2d 77 69 6e 64 |ive-p ed|iff-wind|
|00003a80| 6f 77 2d 41 20 72 61 69 | 73 65 2d 66 72 61 6d 65 |ow-A rai|se-frame|
|00003a90| 20 77 69 6e 64 6f 77 2d | 66 72 61 6d 65 20 65 64 | window-|frame ed|
|00003aa0| 69 66 66 2d 77 69 6e 64 | 6f 77 2d 42 20 65 64 69 |iff-wind|ow-B edi|
|00003ab0| 66 66 2d 77 69 6e 64 6f | 77 2d 43 20 66 72 61 6d |ff-windo|w-C fram|
|00003ac0| 65 2d 6c 69 76 65 2d 70 | 20 65 64 69 66 66 2d 63 |e-live-p| ediff-c|
|00003ad0| 6f 6e 74 72 6f 6c 2d 66 | 72 61 6d 65 20 65 64 69 |ontrol-f|rame edi|
|00003ae0| 66 66 2d 70 72 65 66 65 | 72 2d 6c 6f 6e 67 2d 68 |ff-prefe|r-long-h|
|00003af0| 65 6c 70 2d 6d 65 73 73 | 61 67 65 20 66 72 61 6d |elp-mess|age fram|
|00003b00| 65 20 65 64 69 66 66 2d | 77 69 6e 64 6f 77 2d 64 |e ediff-|window-d|
|00003b10| 69 73 70 6c 61 79 2d 70 | 20 66 72 61 6d 65 2d 69 |isplay-p| frame-i|
|00003b20| 63 6f 6e 69 66 69 65 64 | 2d 70 20 66 72 61 6d 65 |conified|-p frame|
|00003b30| 2d 76 69 73 69 62 6c 65 | 2d 70 20 69 63 6f 6e 20 |-visible|-p icon |
|00003b40| 63 6f 6e 74 72 6f 6c 2d | 66 72 61 6d 65 20 63 6f |control-|frame co|
|00003b50| 6e 74 72 6f 6c 2d 62 75 | 66 20 6e 6f 2d 72 65 68 |ntrol-bu|f no-reh|
|00003b60| 69 67 68 6c 69 67 68 74 | 20 65 64 69 66 66 2d 73 |ighlight| ediff-s|
|00003b70| 65 6c 65 63 74 2d 64 69 | 66 66 65 72 65 6e 63 65 |elect-di|fference|
|00003b80| 20 65 64 69 66 66 2d 63 | 75 72 72 65 6e 74 2d 64 | ediff-c|urrent-d|
|00003b90| 69 66 66 65 72 65 6e 63 | 65 20 65 64 69 66 66 2d |ifferenc|e ediff-|
|00003ba0| 72 65 63 65 6e 74 65 72 | 2d 6f 6e 65 2d 77 69 6e |recenter|-one-win|
|00003bb0| 64 6f 77 20 41 20 42 20 | 43 20 53 74 61 72 74 42 |dow A B |C StartB|
|00003bc0| 75 66 66 65 72 20 28 28 | 73 65 74 2d 62 75 66 66 |uffer ((|set-buff|
|00003bd0| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00003be0| 20 65 64 69 66 66 2d 72 | 65 63 65 6e 74 65 72 2d | ediff-r|ecenter-|
|00003bf0| 61 6e 63 65 73 74 6f 72 | 20 65 64 69 66 66 2d 6d |ancestor| ediff-m|
|00003c00| 75 6c 74 69 66 72 61 6d | 65 20 65 64 69 66 66 2d |ultifram|e ediff-|
|00003c10| 72 65 73 65 74 2d 6d 6f | 75 73 65 20 65 72 72 6f |reset-mo|use erro|
|00003c20| 72 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |r ((set-|buffer S|
|00003c30| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 65 64 69 |tartBuff|er)) edi|
|00003c40| 66 66 2d 72 65 66 72 65 | 73 68 2d 6d 6f 64 65 2d |ff-refre|sh-mode-|
|00003c50| 6c 69 6e 65 73 5d 20 35 | 20 22 5c 0a 42 72 69 6e |lines] 5| "\.Brin|
|00003c60| 67 20 74 68 65 20 68 69 | 67 68 6c 69 67 68 74 65 |g the hi|ghlighte|
|00003c70| 64 20 72 65 67 69 6f 6e | 20 6f 66 20 61 6c 6c 20 |d region| of all |
|00003c80| 62 75 66 66 65 72 73 20 | 62 65 69 6e 67 20 63 6f |buffers |being co|
|00003c90| 6d 70 61 72 65 64 20 69 | 6e 74 6f 20 76 69 65 77 |mpared i|nto view|
|00003ca0| 2e 0a 52 65 65 73 74 61 | 62 6c 69 73 68 20 74 68 |..Reesta|blish th|
|00003cb0| 65 20 64 65 66 61 75 6c | 74 20 74 68 72 65 65 2d |e defaul|t three-|
|00003cc0| 77 69 6e 64 6f 77 20 64 | 69 73 70 6c 61 79 2e 22 |window d|isplay."|
|00003cd0| 20 6e 69 6c 5d 29 0a 28 | 62 79 74 65 2d 63 6f 64 | nil]).(|byte-cod|
|00003ce0| 65 20 22 c0 c1 4d 88 c2 | c3 4d 87 22 20 5b 65 64 |e "..M..|.M." [ed|
|00003cf0| 69 66 66 2d 72 65 63 65 | 6e 74 65 72 2d 6f 6e 65 |iff-rece|nter-one|
|00003d00| 2d 77 69 6e 64 6f 77 20 | 23 5b 28 62 75 66 2d 74 |-window |#[(buf-t|
|00003d10| 79 70 65 29 20 22 c0 19 | 5c 6e 89 11 c3 59 ad 83 |ype) "..|\n...Y..|
|00003d20| 09 0c 57 29 85 a8 00 c5 | 20 1e 06 0e 07 c8 3d ab |..W)....| .....=.|
|00003d30| 85 0e 09 40 aa 96 0e 07 | ca 3d ab 86 0e 09 41 40 |...@....|.=....A@|
|00003d40| aa 8a 0e 07 cb 3d ad 84 | cc 0e 09 38 1e 0d ce 0e |.....=..|...8....|
|00003d50| 0d 21 ad 8e 0e 0f ab 86 | d0 0e 0d 21 aa 84 d1 0e |.!......|...!....|
|00003d60| 0d 21 29 1e 12 0e 13 1e | 14 0e 15 1e 16 d7 d8 d9 |.!).....|........|
|00003d70| 0e 07 5c 22 21 1e 1a db | 0e 1a 4a 21 ad 83 0e 1a |..\"!...|..J!....|
|00003d80| 4a 89 1e 1c ab 8b 0e 1d | ab 87 de 0e 1c 0e 12 5c |J.......|.......\|
|00003d90| 22 88 0e 1c ab a5 df 0e | 1c 21 88 e0 20 88 e1 e2 |".......|.!.. ...|
|00003da0| 0e 07 e3 c0 0e 16 24 e2 | 0e 07 e4 c0 0e 16 24 e2 |......$.|......$.|
|00003db0| 0e 07 e3 c0 0e 16 24 0e | 14 24 88 df 0e 06 21 2e |......$.|.$....!.|
|00003dc0| 06 87 22 20 5b 6e 69 6c | 20 6e 20 65 64 69 66 66 |.." [nil| n ediff|
|00003dd0| 2d 63 75 72 72 65 6e 74 | 2d 64 69 66 66 65 72 65 |-current|-differe|
|00003de0| 6e 63 65 20 30 20 65 64 | 69 66 66 2d 6e 75 6d 62 |nce 0 ed|iff-numb|
|00003df0| 65 72 2d 6f 66 2d 64 69 | 66 66 65 72 65 6e 63 65 |er-of-di|fference|
|00003e00| 73 20 73 65 6c 65 63 74 | 65 64 2d 77 69 6e 64 6f |s select|ed-windo|
|00003e10| 77 20 63 74 6c 2d 77 69 | 6e 64 20 62 75 66 2d 74 |w ctl-wi|nd buf-t|
|00003e20| 79 70 65 20 41 20 65 64 | 69 66 66 2d 6e 61 72 72 |ype A ed|iff-narr|
|00003e30| 6f 77 2d 62 6f 75 6e 64 | 73 20 42 20 43 20 32 20 |ow-bound|s B C 2 |
|00003e40| 6f 76 65 72 6c 20 65 64 | 69 66 66 2d 6f 76 65 72 |overl ed|iff-over|
|00003e50| 6c 61 79 70 20 65 64 69 | 66 66 2d 65 6d 61 63 73 |layp edi|ff-emacs|
|00003e60| 2d 70 20 6f 76 65 72 6c | 61 79 2d 73 74 61 72 74 |-p overl|ay-start|
|00003e70| 20 65 78 74 65 6e 74 2d | 73 74 61 72 74 2d 70 6f | extent-|start-po|
|00003e80| 73 69 74 69 6f 6e 20 73 | 68 69 66 74 20 65 64 69 |sition s|hift edi|
|00003e90| 66 66 2d 6a 6f 62 2d 6e | 61 6d 65 20 6a 6f 62 2d |ff-job-n|ame job-|
|00003ea0| 6e 61 6d 65 20 65 64 69 | 66 66 2d 63 6f 6e 74 72 |name edi|ff-contr|
|00003eb0| 6f 6c 2d 62 75 66 66 65 | 72 20 63 6f 6e 74 72 6f |ol-buffe|r contro|
|00003ec0| 6c 2d 62 75 66 20 69 6e | 74 65 72 6e 20 66 6f 72 |l-buf in|tern for|
|00003ed0| 6d 61 74 20 22 65 64 69 | 66 66 2d 77 69 6e 64 6f |mat "edi|ff-windo|
|00003ee0| 77 2d 25 53 22 20 77 69 | 6e 64 6f 77 2d 6e 61 6d |w-%S" wi|ndow-nam|
|00003ef0| 65 20 77 69 6e 64 6f 77 | 2d 6c 69 76 65 2d 70 20 |e window|-live-p |
|00003f00| 77 69 6e 64 6f 77 20 65 | 64 69 66 66 2d 77 69 6e |window e|diff-win|
|00003f10| 64 6f 77 73 2d 6a 6f 62 | 20 73 65 74 2d 77 69 6e |dows-job| set-win|
|00003f20| 64 6f 77 2d 73 74 61 72 | 74 20 73 65 6c 65 63 74 |dow-star|t select|
|00003f30| 2d 77 69 6e 64 6f 77 20 | 65 64 69 66 66 2d 64 65 |-window |ediff-de|
|00003f40| 61 63 74 69 76 61 74 65 | 2d 6d 61 72 6b 20 65 64 |activate|-mark ed|
|00003f50| 69 66 66 2d 70 6f 73 69 | 74 69 6f 6e 2d 72 65 67 |iff-posi|tion-reg|
|00003f60| 69 6f 6e 20 65 64 69 66 | 66 2d 67 65 74 2d 64 69 |ion edif|f-get-di|
|00003f70| 66 66 2d 70 6f 73 6e 20 | 62 65 67 20 65 6e 64 5d |ff-posn |beg end]|
|00003f80| 20 39 5d 20 65 64 69 66 | 66 2d 72 65 63 65 6e 74 | 9] edif|f-recent|
|00003f90| 65 72 2d 61 6e 63 65 73 | 74 6f 72 20 23 5b 6e 69 |er-ances|tor #[ni|
|00003fa0| 6c 20 22 08 85 87 00 c1 | 08 21 ad fe c2 c1 08 21 |l ".....|.!.....!|
|00003fb0| 21 ad f7 c3 1c 0d 89 14 | c6 59 ad 84 0c 0e 07 57 |!.......|.Y.....W|
|00003fc0| 29 ad e7 c8 08 21 c9 20 | 0e 5c 6e 0e 0b 1e 0c 1e |)....!. |.\n.....|
|00003fd0| 0d 1e 0e 1e 0f 70 1e 10 | 08 ab c0 c1 08 21 ab bb |.....p..|.....!..|
|00003fe0| c2 c1 08 21 21 ab b4 d1 | 8e 08 71 88 d2 d3 d4 c3 |...!!...|..q.....|
|00003ff0| 0e 0c 24 62 88 0e 0f ab | 9f d5 0e 0f 21 88 d6 d2 |..$b....|....!...|
|00004000| d3 d4 c3 0e 0c 24 d2 d3 | d7 c3 0e 0c 24 d2 d3 d4 |.....$..|....$...|
|00004010| c3 0e 0c 24 0e 0d 24 88 | 29 aa 8a 0e 18 d9 3d ac |...$..$.|).....=.|
|00004020| 84 da db 21 88 29 d5 0e | 0e 21 2c 87 22 20 5b 65 |...!.)..|.!,." [e|
|00004030| 64 69 66 66 2d 61 6e 63 | 65 73 74 6f 72 2d 62 75 |diff-anc|estor-bu|
|00004040| 66 66 65 72 20 67 65 74 | 2d 62 75 66 66 65 72 20 |ffer get|-buffer |
|00004050| 62 75 66 66 65 72 2d 6e | 61 6d 65 20 6e 69 6c 20 |buffer-n|ame nil |
|00004060| 6e 20 65 64 69 66 66 2d | 63 75 72 72 65 6e 74 2d |n ediff-|current-|
|00004070| 64 69 66 66 65 72 65 6e | 63 65 20 30 20 65 64 69 |differen|ce 0 edi|
|00004080| 66 66 2d 6e 75 6d 62 65 | 72 2d 6f 66 2d 64 69 66 |ff-numbe|r-of-dif|
|00004090| 66 65 72 65 6e 63 65 73 | 20 65 64 69 66 66 2d 67 |ferences| ediff-g|
|000040a0| 65 74 2d 76 69 73 69 62 | 6c 65 2d 62 75 66 66 65 |et-visib|le-buffe|
|000040b0| 72 2d 77 69 6e 64 6f 77 | 20 73 65 6c 65 63 74 65 |r-window| selecte|
|000040c0| 64 2d 77 69 6e 64 6f 77 | 20 65 64 69 66 66 2d 6a |d-window| ediff-j|
|000040d0| 6f 62 2d 6e 61 6d 65 20 | 65 64 69 66 66 2d 63 6f |ob-name |ediff-co|
|000040e0| 6e 74 72 6f 6c 2d 62 75 | 66 66 65 72 20 63 74 6c |ntrol-bu|ffer ctl|
|000040f0| 2d 62 75 66 20 6a 6f 62 | 2d 6e 61 6d 65 20 63 74 |-buf job|-name ct|
|00004100| 6c 2d 77 69 6e 64 20 77 | 69 6e 64 6f 77 20 53 74 |l-wind w|indow St|
|00004110| 61 72 74 42 75 66 66 65 | 72 20 28 28 73 65 74 2d |artBuffe|r ((set-|
|00004120| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00004130| 65 72 29 29 20 65 64 69 | 66 66 2d 67 65 74 2d 64 |er)) edi|ff-get-d|
|00004140| 69 66 66 2d 70 6f 73 6e | 20 41 6e 63 65 73 74 6f |iff-posn| Ancesto|
|00004150| 72 20 62 65 67 20 73 65 | 6c 65 63 74 2d 77 69 6e |r beg se|lect-win|
|00004160| 64 6f 77 20 65 64 69 66 | 66 2d 70 6f 73 69 74 69 |dow edif|f-positi|
|00004170| 6f 6e 2d 72 65 67 69 6f | 6e 20 65 6e 64 20 74 68 |on-regio|n end th|
|00004180| 69 73 2d 63 6f 6d 6d 61 | 6e 64 20 65 64 69 66 66 |is-comma|nd ediff|
|00004190| 2d 71 75 69 74 20 65 72 | 72 6f 72 20 22 59 6f 75 |-quit er|ror "You|
|000041a0| 27 76 65 20 6b 69 6c 6c | 65 64 20 61 6e 20 65 73 |'ve kill|ed an es|
|000041b0| 73 65 6e 74 69 61 6c 20 | 45 64 69 66 66 20 62 75 |sential |Ediff bu|
|000041c0| 66 66 65 72 2d 2d 2d 50 | 6c 65 61 73 65 20 71 75 |ffer---P|lease qu|
|000041d0| 69 74 20 45 64 69 66 66 | 22 5d 20 39 5d 5d 20 32 |it Ediff|"] 9]] 2|
|000041e0| 29 0a 28 66 73 65 74 20 | 27 65 64 69 66 66 2d 74 |).(fset |'ediff-t|
|000041f0| 6f 67 67 6c 65 2d 73 70 | 6c 69 74 20 23 5b 6e 69 |oggle-sp|lit #[ni|
|00004200| 6c 20 22 c0 09 21 ad 81 | 09 1a c0 0b 21 ad 81 0b |l "..!..|....!...|
|00004210| 1c c0 0d 21 ad 81 0d 1e | 06 5c 6e ad 83 c7 5c 6e |...!....|.\n...\n|
|00004220| 21 1e 08 0c ad 83 c7 0c | 21 1e 09 0e 06 ad 84 c7 |!.......|!.......|
|00004230| 0e 06 21 1e 5c 6e 0e 08 | 0e 09 3d ac a4 cb 0e 08 |..!.\n..|..=.....|
|00004240| 21 ab 9e cb 0e 09 21 ab | 98 0e 0c ab a2 cb 0e 5c |!.....!.|.......\|
|00004250| 6e 21 ab 8e 0e 08 0e 5c | 6e 3d ac 87 0e 09 0e 5c |n!.....\|n=.....\|
|00004260| 6e 3d ab 8e 0e 0d ce 3d | ab 83 cf aa 81 ce 16 0d |n=.....=|........|
|00004270| aa 84 d0 d1 21 88 d2 d3 | 21 2e 06 87 22 20 5b 77 |....!...|!..." [w|
|00004280| 69 6e 64 6f 77 2d 6c 69 | 76 65 2d 70 20 65 64 69 |indow-li|ve-p edi|
|00004290| 66 66 2d 77 69 6e 64 6f | 77 2d 41 20 77 69 6e 64 |ff-windo|w-A wind|
|000042a0| 2d 41 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |-A ediff|-window-|
|000042b0| 42 20 77 69 6e 64 2d 42 | 20 65 64 69 66 66 2d 77 |B wind-B| ediff-w|
|000042c0| 69 6e 64 6f 77 2d 43 20 | 77 69 6e 64 2d 43 20 77 |indow-C |wind-C w|
|000042d0| 69 6e 64 6f 77 2d 66 72 | 61 6d 65 20 66 72 61 6d |indow-fr|ame fram|
|000042e0| 65 2d 41 20 66 72 61 6d | 65 2d 42 20 66 72 61 6d |e-A fram|e-B fram|
|000042f0| 65 2d 43 20 66 72 61 6d | 65 2d 6c 69 76 65 2d 70 |e-C fram|e-live-p|
|00004300| 20 65 64 69 66 66 2d 33 | 77 61 79 2d 63 6f 6d 70 | ediff-3|way-comp|
|00004310| 61 72 69 73 6f 6e 2d 6a | 6f 62 20 65 64 69 66 66 |arison-j|ob ediff|
|00004320| 2d 73 70 6c 69 74 2d 77 | 69 6e 64 6f 77 2d 66 75 |-split-w|indow-fu|
|00004330| 6e 63 74 69 6f 6e 20 73 | 70 6c 69 74 2d 77 69 6e |nction s|plit-win|
|00004340| 64 6f 77 2d 76 65 72 74 | 69 63 61 6c 6c 79 20 73 |dow-vert|ically s|
|00004350| 70 6c 69 74 2d 77 69 6e | 64 6f 77 2d 68 6f 72 69 |plit-win|dow-hori|
|00004360| 7a 6f 6e 74 61 6c 6c 79 | 20 6d 65 73 73 61 67 65 |zontally| message|
|00004370| 20 22 42 75 66 66 65 72 | 73 20 62 65 69 6e 67 20 | "Buffer|s being |
|00004380| 63 6f 6d 70 61 72 65 64 | 20 61 72 65 20 69 6e 20 |compared| are in |
|00004390| 64 69 66 66 65 72 65 6e | 74 20 66 72 61 6d 65 73 |differen|t frames|
|000043a0| 22 20 65 64 69 66 66 2d | 72 65 63 65 6e 74 65 72 |" ediff-|recenter|
|000043b0| 20 6e 6f 2d 72 65 68 69 | 67 68 6c 69 67 68 74 5d | no-rehi|ghlight]|
|000043c0| 20 32 20 22 5c 0a 54 6f | 67 67 6c 65 20 76 65 72 | 2 "\.To|ggle ver|
|000043d0| 74 69 63 61 6c 2f 68 6f | 72 69 7a 6f 6e 74 61 6c |tical/ho|rizontal|
|000043e0| 20 77 69 6e 64 6f 77 20 | 73 70 6c 69 74 2e 20 0a | window |split. .|
|000043f0| 44 6f 65 73 20 6e 6f 74 | 68 69 6e 67 20 69 66 20 |Does not|hing if |
|00004400| 66 69 6c 65 2d 41 20 61 | 6e 64 20 66 69 6c 65 2d |file-A a|nd file-|
|00004410| 42 20 61 72 65 20 69 6e | 20 64 69 66 66 65 72 65 |B are in| differe|
|00004420| 6e 74 20 66 72 61 6d 65 | 73 2e 22 20 6e 69 6c 5d |nt frame|s." nil]|
|00004430| 29 0a 28 66 73 65 74 20 | 27 65 64 69 66 66 2d 74 |).(fset |'ediff-t|
|00004440| 6f 67 67 6c 65 2d 68 69 | 6c 69 74 20 23 5b 6e 69 |oggle-hi|lit #[ni|
|00004450| 6c 20 22 c0 20 ab 86 c0 | 20 c1 3e ab 99 5c 6e c3 |l ". ...| .>..\n.|
|00004460| 3d ab 8e c4 c5 21 88 c6 | 0e 07 c8 5c 22 88 c9 89 |=....!..|...\"...|
|00004470| 12 87 c6 0e 07 ca 5c 22 | 87 c6 0e 07 c8 5c 22 88 |......\"|.....\".|
|00004480| 0e 0b ab 8d 0e 0c ab 89 | c4 cd 21 88 ce 16 0c aa |........|..!.....|
|00004490| 97 0e 0b ab 89 c4 cf 21 | 88 ce 16 0b aa 8a c4 d0 |.......!|........|
|000044a0| 21 88 d1 16 0b d1 16 0c | 0e 0b ab 89 0e 0c ab 85 |!.......|........|
|000044b0| d2 20 88 aa 84 d2 d3 21 | 88 c6 0e 07 ca 5c 22 87 |. .....!|.....\".|
|000044c0| 22 20 5b 65 64 69 66 66 | 2d 64 65 76 69 63 65 2d |" [ediff|-device-|
|000044d0| 74 79 70 65 20 28 74 74 | 79 20 73 74 72 65 61 6d |type (tt|y stream|
|000044e0| 29 20 65 64 69 66 66 2d | 68 69 67 68 6c 69 67 68 |) ediff-|highligh|
|000044f0| 74 69 6e 67 2d 73 74 79 | 6c 65 20 61 73 63 69 69 |ting-sty|le ascii|
|00004500| 20 6d 65 73 73 61 67 65 | 20 22 41 53 43 49 49 20 | message| "ASCII |
|00004510| 68 69 67 68 6c 69 67 68 | 74 69 6e 67 20 66 6c 61 |highligh|ting fla|
|00004520| 67 73 20 72 65 6d 6f 76 | 65 64 22 20 65 64 69 66 |gs remov|ed" edif|
|00004530| 66 2d 75 6e 73 65 6c 65 | 63 74 2d 61 6e 64 2d 73 |f-unsele|ct-and-s|
|00004540| 65 6c 65 63 74 2d 64 69 | 66 66 65 72 65 6e 63 65 |elect-di|fference|
|00004550| 20 65 64 69 66 66 2d 63 | 75 72 72 65 6e 74 2d 64 | ediff-c|urrent-d|
|00004560| 69 66 66 65 72 65 6e 63 | 65 20 75 6e 73 65 6c 65 |ifferenc|e unsele|
|00004570| 63 74 2d 6f 6e 6c 79 20 | 6f 66 66 20 73 65 6c 65 |ct-only |off sele|
|00004580| 63 74 2d 6f 6e 6c 79 20 | 65 64 69 66 66 2d 75 73 |ct-only |ediff-us|
|00004590| 65 2d 66 61 63 65 73 20 | 65 64 69 66 66 2d 68 69 |e-faces |ediff-hi|
|000045a0| 67 68 6c 69 67 68 74 2d | 61 6c 6c 2d 64 69 66 66 |ghlight-|all-diff|
|000045b0| 73 20 22 55 6e 68 69 67 | 68 6c 69 67 68 74 69 6e |s "Unhig|hlightin|
|000045c0| 67 20 75 6e 73 65 6c 65 | 63 74 65 64 20 64 69 66 |g unsele|cted dif|
|000045d0| 66 65 72 65 6e 63 65 20 | 72 65 67 69 6f 6e 73 22 |ference |regions"|
|000045e0| 20 6e 69 6c 20 22 48 69 | 67 68 6c 69 67 68 74 69 | nil "Hi|ghlighti|
|000045f0| 6e 67 20 77 69 74 68 20 | 41 53 43 49 49 20 66 6c |ng with |ASCII fl|
|00004600| 61 67 73 22 20 22 52 65 | 2d 68 69 67 68 6c 69 67 |ags" "Re|-highlig|
|00004610| 68 74 69 6e 67 20 61 6c | 6c 20 64 69 66 66 65 72 |hting al|l differ|
|00004620| 65 6e 63 65 20 72 65 67 | 69 6f 6e 73 22 20 74 20 |ence reg|ions" t |
|00004630| 65 64 69 66 66 2d 63 6f | 6c 6f 72 2d 62 61 63 6b |ediff-co|lor-back|
|00004640| 67 72 6f 75 6e 64 2d 72 | 65 67 69 6f 6e 73 20 75 |ground-r|egions u|
|00004650| 6e 68 69 67 68 6c 69 67 | 68 74 5d 20 33 20 22 5c |nhighlig|ht] 3 "\|
|00004660| 0a 53 77 69 74 63 68 20 | 62 65 74 77 65 65 6e 20 |.Switch |between |
|00004670| 68 69 67 68 6c 69 67 68 | 74 69 6e 67 20 75 73 69 |highligh|ting usi|
|00004680| 6e 67 20 41 53 43 49 49 | 20 66 6c 61 67 73 20 61 |ng ASCII| flags a|
|00004690| 6e 64 20 68 69 67 68 6c | 69 67 68 74 69 6e 67 20 |nd highl|ighting |
|000046a0| 75 73 69 6e 67 20 66 61 | 63 65 73 2e 0a 4f 6e 20 |using fa|ces..On |
|000046b0| 61 20 64 75 6d 62 20 74 | 65 72 6d 69 6e 61 6c 2c |a dumb t|erminal,|
|000046c0| 20 73 77 69 74 63 68 65 | 73 20 62 65 74 77 65 65 | switche|s betwee|
|000046d0| 6e 20 41 53 43 49 49 20 | 68 69 67 68 6c 69 67 68 |n ASCII |highligh|
|000046e0| 74 69 6e 67 20 61 6e 64 | 20 6e 6f 20 68 69 67 68 |ting and| no high|
|000046f0| 6c 69 67 68 74 69 6e 67 | 2e 22 20 6e 69 6c 5d 29 |lighting|." nil])|
|00004700| 0a 28 66 73 65 74 20 27 | 65 64 69 66 66 2d 74 6f |.(fset '|ediff-to|
|00004710| 67 67 6c 65 2d 61 75 74 | 6f 72 65 66 69 6e 65 20 |ggle-aut|orefine |
|00004720| 23 5b 6e 69 6c 20 22 08 | ab 84 c1 c2 21 88 0b c4 |#[nil ".|....!...|
|00004730| 3d ab 8c c5 13 c6 0e 07 | c8 5c 22 88 c9 ca 21 87 |=.......|.\"...!.|
|00004740| 0b c5 3d ab 88 c9 cb 21 | 88 cc 89 13 87 cd 0e 07 |..=....!|........|
|00004750| ce 5c 22 88 c9 cf 21 88 | c4 89 13 87 22 20 5b 65 |.\"...!.|...." [e|
|00004760| 64 69 66 66 2d 77 6f 72 | 64 2d 6d 6f 64 65 20 65 |diff-wor|d-mode e|
|00004770| 72 72 6f 72 20 22 4e 6f | 20 66 69 6e 65 20 64 69 |rror "No| fine di|
|00004780| 66 66 65 72 65 6e 63 65 | 73 20 69 6e 20 74 68 69 |fference|s in thi|
|00004790| 73 20 6d 6f 64 65 22 20 | 65 64 69 66 66 2d 61 75 |s mode" |ediff-au|
|000047a0| 74 6f 2d 72 65 66 69 6e | 65 20 6e 69 78 20 6f 6e |to-refin|e nix on|
|000047b0| 20 65 64 69 66 66 2d 6d | 61 6b 65 2d 66 69 6e 65 | ediff-m|ake-fine|
|000047c0| 2d 64 69 66 66 73 20 65 | 64 69 66 66 2d 63 75 72 |-diffs e|diff-cur|
|000047d0| 72 65 6e 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |rent-dif|ference |
|000047e0| 6e 6f 66 6f 72 63 65 20 | 6d 65 73 73 61 67 65 20 |noforce |message |
|000047f0| 22 41 75 74 6f 2d 72 65 | 66 69 6e 69 6e 67 20 69 |"Auto-re|fining i|
|00004800| 73 20 4f 4e 22 20 22 41 | 75 74 6f 2d 72 65 66 69 |s ON" "A|uto-refi|
|00004810| 6e 69 6e 67 20 69 73 20 | 4f 46 46 22 20 6f 66 66 |ning is |OFF" off|
|00004820| 20 65 64 69 66 66 2d 73 | 65 74 2d 66 69 6e 65 2d | ediff-s|et-fine-|
|00004830| 64 69 66 66 2d 70 72 6f | 70 65 72 74 69 65 73 20 |diff-pro|perties |
|00004840| 64 65 66 61 75 6c 74 20 | 22 52 65 66 69 6e 65 6d |default |"Refinem|
|00004850| 65 6e 74 73 20 61 72 65 | 20 48 49 44 44 45 4e 22 |ents are| HIDDEN"|
|00004860| 5d 20 33 20 22 5c 0a 54 | 6f 67 67 6c 65 20 61 75 |] 3 "\.T|oggle au|
|00004870| 74 6f 2d 72 65 66 69 6e | 65 20 6d 6f 64 65 2e 22 |to-refin|e mode."|
|00004880| 20 6e 69 6c 5d 29 0a 28 | 66 73 65 74 20 27 65 64 | nil]).(|fset 'ed|
|00004890| 69 66 66 2d 73 68 6f 77 | 2d 61 6e 63 65 73 74 6f |iff-show|-ancesto|
|000048a0| 72 20 23 5b 6e 69 6c 20 | 22 c0 20 88 09 ab 8c c2 |r #[nil |". .....|
|000048b0| 09 21 ab 87 c3 c2 09 21 | 21 ac 8d 0c ab 86 c5 c6 |.!.....!|!.......|
|000048c0| 21 88 aa 84 c5 c7 21 88 | c8 1e 09 ca 09 21 89 16 |!.....!.|.....!..|
|000048d0| 09 ab 88 cb cc 0e 09 21 | 21 aa 85 cd 0e 0e 09 5c |.......!|!......\|
|000048e0| 22 29 87 22 20 5b 65 64 | 69 66 66 2d 72 65 63 65 |")." [ed|iff-rece|
|000048f0| 6e 74 65 72 20 65 64 69 | 66 66 2d 61 6e 63 65 73 |nter edi|ff-ances|
|00004900| 74 6f 72 2d 62 75 66 66 | 65 72 20 67 65 74 2d 62 |tor-buff|er get-b|
|00004910| 75 66 66 65 72 20 62 75 | 66 66 65 72 2d 6e 61 6d |uffer bu|ffer-nam|
|00004920| 65 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 77 69 |e ediff-|merge-wi|
|00004930| 74 68 2d 61 6e 63 65 73 | 74 6f 72 2d 6a 6f 62 20 |th-ances|tor-job |
|00004940| 65 72 72 6f 72 20 22 4c | 6f 73 74 20 63 6f 6e 6e |error "L|ost conn|
|00004950| 65 63 74 69 6f 6e 20 74 | 6f 20 61 6e 63 65 73 74 |ection t|o ancest|
|00004960| 6f 72 20 62 75 66 66 65 | 72 2e 2e 2e 73 6f 72 72 |or buffe|r...sorr|
|00004970| 79 22 20 22 4e 6f 74 20 | 6d 65 72 67 69 6e 67 20 |y" "Not |merging |
|00004980| 77 69 74 68 20 61 6e 63 | 65 73 74 6f 72 22 20 6e |with anc|estor" n|
|00004990| 69 6c 20 77 69 6e 64 20 | 65 64 69 66 66 2d 67 65 |il wind |ediff-ge|
|000049a0| 74 2d 76 69 73 69 62 6c | 65 2d 62 75 66 66 65 72 |t-visibl|e-buffer|
|000049b0| 2d 77 69 6e 64 6f 77 20 | 72 61 69 73 65 2d 66 72 |-window |raise-fr|
|000049c0| 61 6d 65 20 77 69 6e 64 | 6f 77 2d 66 72 61 6d 65 |ame wind|ow-frame|
|000049d0| 20 73 65 74 2d 77 69 6e | 64 6f 77 2d 62 75 66 66 | set-win|dow-buff|
|000049e0| 65 72 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |er ediff|-window-|
|000049f0| 43 5d 20 33 20 22 5c 0a | 53 68 6f 77 20 74 68 65 |C] 3 "\.|Show the|
|00004a00| 20 61 6e 63 65 73 74 6f | 72 20 62 75 66 66 65 72 | ancesto|r buffer|
|00004a10| 20 69 6e 20 61 20 73 75 | 69 74 61 62 6c 65 20 77 | in a su|itable w|
|00004a20| 69 6e 64 6f 77 2e 22 20 | 6e 69 6c 5d 29 0a 28 66 |indow." |nil]).(f|
|00004a30| 73 65 74 20 27 65 64 69 | 66 66 2d 6d 61 6b 65 2d |set 'edi|ff-make-|
|00004a40| 6f 72 2d 6b 69 6c 6c 2d | 66 69 6e 65 2d 64 69 66 |or-kill-|fine-dif|
|00004a50| 66 73 20 23 5b 28 61 72 | 67 29 20 22 08 c1 3d ab |fs #[(ar|g) "..=.|
|00004a60| 96 5c 6e 1b c4 0b c5 5c | 22 88 c4 0b c6 5c 22 88 |.\n....\|"....\".|
|00004a70| 0e 07 ad 84 c4 0b c8 5c | 22 29 87 08 a7 ab 9b 08 |.......\|")......|
|00004a80| c9 57 ab 96 5c 6e 1b c4 | 0b c5 5c 22 88 c4 0b c6 |.W..\n..|..\"....|
|00004a90| 5c 22 88 0e 07 ad 84 c4 | 0b c8 5c 22 29 87 ca 20 |\"......|..\").. |
|00004aa0| 87 22 20 5b 61 72 67 20 | 2d 20 65 64 69 66 66 2d |." [arg |- ediff-|
|00004ab0| 63 75 72 72 65 6e 74 2d | 64 69 66 66 65 72 65 6e |current-|differen|
|00004ac0| 63 65 20 6e 20 65 64 69 | 66 66 2d 63 6c 65 61 72 |ce n edi|ff-clear|
|00004ad0| 2d 66 69 6e 65 2d 64 69 | 66 66 65 72 65 6e 63 65 |-fine-di|fference|
|00004ae0| 73 2d 69 6e 2d 6f 6e 65 | 2d 62 75 66 66 65 72 20 |s-in-one|-buffer |
|00004af0| 41 20 42 20 65 64 69 66 | 66 2d 33 77 61 79 2d 6a |A B edif|f-3way-j|
|00004b00| 6f 62 20 43 20 30 20 65 | 64 69 66 66 2d 6d 61 6b |ob C 0 e|diff-mak|
|00004b10| 65 2d 66 69 6e 65 2d 64 | 69 66 66 73 5d 20 33 20 |e-fine-d|iffs] 3 |
|00004b20| 22 5c 0a 43 6f 6d 70 75 | 74 65 20 66 69 6e 65 20 |"\.Compu|te fine |
|00004b30| 64 69 66 66 73 2e 20 57 | 69 74 68 20 6e 65 67 61 |diffs. W|ith nega|
|00004b40| 74 69 76 65 20 70 72 65 | 66 69 78 20 61 72 67 2c |tive pre|fix arg,|
|00004b50| 20 6b 69 6c 6c 20 66 69 | 6e 65 20 64 69 66 66 73 | kill fi|ne diffs|
|00004b60| 2e 0a 49 6e 20 62 6f 74 | 68 20 63 61 73 65 73 2c |..In bot|h cases,|
|00004b70| 20 6f 70 65 72 61 74 65 | 73 20 6f 6e 20 74 68 65 | operate|s on the|
|00004b80| 20 63 75 72 72 72 65 6e | 74 20 64 69 66 66 65 72 | currren|t differ|
|00004b90| 65 6e 63 65 20 72 65 67 | 69 6f 6e 2e 22 20 22 50 |ence reg|ion." "P|
|00004ba0| 22 5d 29 0a 28 66 73 65 | 74 20 27 65 64 69 66 66 |"]).(fse|t 'ediff|
|00004bb0| 2d 74 6f 67 67 6c 65 2d | 68 65 6c 70 20 23 5b 6e |-toggle-|help #[n|
|00004bc0| 69 6c 20 22 c0 19 c2 20 | 88 0b 3f 13 c4 20 88 29 |il "... |..?.. .)|
|00004bd0| 0b ab a9 c5 20 ab a5 0e | 06 ab a1 0e 07 1e 08 c5 |.... ...|........|
|00004be0| 20 ad 96 c9 0e 08 21 ad | 90 0e 5c 6e ab 86 cb 0e | .....!.|..\n....|
|00004bf0| 08 21 aa 86 cc 0e 08 21 | cd 3d 29 16 0e cf 16 10 |.!.....!|.=).....|
|00004c00| d1 d2 21 87 22 20 5b 6e | 69 6c 20 62 75 66 66 65 |..!." [n|il buffe|
|00004c10| 72 2d 72 65 61 64 2d 6f | 6e 6c 79 20 65 72 61 73 |r-read-o|nly eras|
|00004c20| 65 2d 62 75 66 66 65 72 | 20 65 64 69 66 66 2d 70 |e-buffer| ediff-p|
|00004c30| 72 65 66 65 72 2d 6c 6f | 6e 67 2d 68 65 6c 70 2d |refer-lo|ng-help-|
|00004c40| 6d 65 73 73 61 67 65 20 | 65 64 69 66 66 2d 73 65 |message |ediff-se|
|00004c50| 74 2d 68 65 6c 70 2d 6d | 65 73 73 61 67 65 20 65 |t-help-m|essage e|
|00004c60| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 64 69 73 70 |diff-win|dow-disp|
|00004c70| 6c 61 79 2d 70 20 65 64 | 69 66 66 2d 6d 75 6c 74 |lay-p ed|iff-mult|
|00004c80| 69 66 72 61 6d 65 20 65 | 64 69 66 66 2d 63 6f 6e |iframe e|diff-con|
|00004c90| 74 72 6f 6c 2d 66 72 61 | 6d 65 20 66 72 61 6d 65 |trol-fra|me frame|
|00004ca0| 20 66 72 61 6d 65 2d 6c | 69 76 65 2d 70 20 65 64 | frame-l|ive-p ed|
|00004cb0| 69 66 66 2d 78 65 6d 61 | 63 73 2d 70 20 66 72 61 |iff-xema|cs-p fra|
|00004cc0| 6d 65 2d 69 63 6f 6e 69 | 66 69 65 64 2d 70 20 66 |me-iconi|fied-p f|
|00004cd0| 72 61 6d 65 2d 76 69 73 | 69 62 6c 65 2d 70 20 69 |rame-vis|ible-p i|
|00004ce0| 63 6f 6e 20 65 64 69 66 | 66 2d 70 72 65 66 65 72 |con edif|f-prefer|
|00004cf0| 2d 69 63 6f 6e 69 66 69 | 65 64 2d 63 6f 6e 74 72 |-iconifi|ed-contr|
|00004d00| 6f 6c 2d 66 72 61 6d 65 | 20 22 22 20 65 64 69 66 |ol-frame| "" edif|
|00004d10| 66 2d 77 69 6e 64 6f 77 | 2d 63 6f 6e 66 69 67 2d |f-window|-config-|
|00004d20| 73 61 76 65 64 20 65 64 | 69 66 66 2d 72 65 63 65 |saved ed|iff-rece|
|00004d30| 6e 74 65 72 20 6e 6f 2d | 72 65 68 69 67 68 6c 69 |nter no-|rehighli|
|00004d40| 67 68 74 5d 20 32 20 22 | 5c 0a 54 6f 67 67 6c 65 |ght] 2 "|\.Toggle|
|00004d50| 20 73 68 6f 72 74 2f 6c | 6f 6e 67 20 68 65 6c 70 | short/l|ong help|
|00004d60| 20 6d 65 73 73 61 67 65 | 2e 22 20 6e 69 6c 5d 29 | message|." nil])|
|00004d70| 0a 28 66 73 65 74 20 27 | 65 64 69 66 66 2d 74 6f |.(fset '|ediff-to|
|00004d80| 67 67 6c 65 2d 72 65 61 | 64 2d 6f 6e 6c 79 20 23 |ggle-rea|d-only #|
|00004d90| 5b 28 26 6f 70 74 69 6f | 6e 61 6c 20 62 75 66 29 |[(&optio|nal buf)|
|00004da0| 20 22 08 3f ad 81 70 19 | 08 ac 83 c2 20 88 08 ac | ".?..p.|.... ...|
|00004db0| f7 0b c4 3e ab 83 c5 aa | 8e 0b c6 3e ab 83 c7 aa |...>....|...>....|
|00004dc0| 86 0b c8 3e ad 81 c9 c5 | 3d ab 84 0e 5c 6e aa d8 |...>....|=...\n..|
|00004dd0| 0b cb 3e ab 83 c5 aa 8e | 0b cc 3e ab 83 c7 aa 86 |..>.....|..>.....|
|00004de0| 0b cd 3e ad 81 c9 c7 3d | ab 84 0e 0e aa ba 0b cf |..>....=|........|
|00004df0| 3e ab 83 c5 aa 8e 0b d0 | 3e ab 83 c7 aa 86 0b d1 |>.......|>.......|
|00004e00| 3e ad 81 c9 c9 3d ab 84 | 0e 12 aa 9c 0b d3 3e ab |>....=..|......>.|
|00004e10| 83 c5 aa 8e 0b d4 3e ab | 83 c7 aa 86 0b d5 3e ad |......>.|......>.|
|00004e20| 81 c9 d6 3d ad 82 0e 17 | 10 70 1e 18 08 83 13 02 |...=....|.p......|
|00004e30| d9 08 21 83 13 02 da d9 | 08 21 21 83 13 02 db 8e |..!.....|.!!.....|
|00004e40| 08 71 88 dc 08 21 89 1e | 1d ad 8a de 0e 1d 21 ad |.q...!..|......!.|
|00004e50| 84 df 0e 1d 21 1e 20 0e | 21 ae aa 0e 1d 89 1e 1d |....!. .|!.......|
|00004e60| 3b ad 92 de 0e 1d 21 ad | 8c df 0e 1d 21 ad 86 de |;.....!.|....!...|
|00004e70| 0e 1d e2 50 21 29 ab 83 | e3 aa 8a 0e 20 ab 83 e3 |...P!)..|.... ...|
|00004e80| aa 83 e4 e5 21 1e 26 0e | 1d 89 1e 1d 3b ad 93 de |....!.&.|....;...|
|00004e90| 0e 1d 21 ad 8d df 0e 1d | 21 3f ad 86 de 0e 1d e2 |..!.....|!?......|
|00004ea0| 50 21 29 83 9d 01 09 83 | 9d 01 0e 27 ac 86 e3 16 |P!).....|...'....|
|00004eb0| 26 82 9d 01 e8 e9 21 88 | ea eb ec 0e 1d ed 1e 2e |&.....!.|........|
|00004ec0| 1e 1d 0e 2e 3b ab 8e 0e | 2e ef 42 43 1e 30 f1 0e |....;...|..BC.0..|
|00004ed0| 1d 21 29 aa 8f 0e 32 ab | 86 f1 0e 1d 21 aa 85 f1 |.!)...2.|....!...|
|00004ee0| 0e 1d f3 5c 22 2a 5c 22 | 21 ab c2 70 1e 18 09 ab |...\"*\"|!..p....|
|00004ef0| af d9 09 21 ab aa da d9 | 09 21 21 ab a3 f4 8e 09 |...!....|.!!.....|
|00004f00| 71 88 f5 e7 ed 0b f6 3e | ab 83 c5 aa 8e 0b f7 3e |q......>|.......>|
|00004f10| ab 83 c7 aa 86 0b f8 3e | ad 81 c9 23 88 29 aa 8a |.......>|...#.)..|
|00004f20| 0e 39 fa 3d ac 84 fb fc | 21 88 29 aa 95 e3 16 26 |.9.=....|!.)....&|
|00004f30| e8 e9 21 88 e8 e9 21 88 | fd fe 21 88 ff 81 40 00 |..!...!.|..!...@.|
|00004f40| 21 88 0e 26 ab 98 81 41 | 00 81 42 00 81 43 00 0e |!..&...A|..B..C..|
|00004f50| 26 21 5c 22 ab 89 8a 81 | 44 00 8b 88 29 aa 87 fb |&!\"....|D...)...|
|00004f60| 81 45 00 08 5c 22 88 0e | 1d ad cc 0e 27 3f ad c7 |.E..\"..|....'?..|
|00004f70| 0e 39 81 46 00 3d ad bf | de 0e 1d 21 ad b9 df 0e |.9.F.=..|...!....|
|00004f80| 1d 21 3f ad b2 fd 81 47 | 00 0e 1d ed 1e 2e 1e 1d |.!?....G|........|
|00004f90| 0e 2e 3b ab 8e 0e 2e ef | 42 43 1e 30 f1 0e 1d 21 |..;.....|BC.0...!|
|00004fa0| 29 aa 8f 0e 32 ab 86 f1 | 0e 1d 21 aa 85 f1 0e 1d |)...2...|..!.....|
|00004fb0| f3 5c 22 2a e8 e9 21 23 | 2c aa 89 0e 39 fa 3d ae |.\"*..!#|,...9.=.|
|00004fc0| 83 fb fc 21 2a 87 22 20 | 5b 62 75 66 20 63 74 6c |...!*." |[buf ctl|
|00004fd0| 2d 62 75 66 20 65 64 69 | 66 66 2d 72 65 63 65 6e |-buf edi|ff-recen|
|00004fe0| 74 65 72 20 6c 61 73 74 | 2d 63 6f 6d 6d 61 6e 64 |ter last|-command|
|00004ff0| 2d 63 68 61 72 20 28 39 | 37 20 36 35 29 20 41 20 |-char (9|7 65) A |
|00005000| 28 39 38 20 36 36 29 20 | 42 20 28 39 39 20 36 37 |(98 66) |B (99 67|
|00005010| 29 20 43 20 65 64 69 66 | 66 2d 62 75 66 66 65 72 |) C edif|f-buffer|
|00005020| 2d 41 20 28 39 37 20 36 | 35 29 20 28 39 38 20 36 |-A (97 6|5) (98 6|
|00005030| 36 29 20 28 39 39 20 36 | 37 29 20 65 64 69 66 66 |6) (99 6|7) ediff|
|00005040| 2d 62 75 66 66 65 72 2d | 42 20 28 39 37 20 36 35 |-buffer-|B (97 65|
|00005050| 29 20 28 39 38 20 36 36 | 29 20 28 39 39 20 36 37 |) (98 66|) (99 67|
|00005060| 29 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 43 |) ediff-|buffer-C|
|00005070| 20 28 39 37 20 36 35 29 | 20 28 39 38 20 36 36 29 | (97 65)| (98 66)|
|00005080| 20 28 39 39 20 36 37 29 | 20 41 6e 63 65 73 74 6f | (99 67)| Ancesto|
|00005090| 72 20 65 64 69 66 66 2d | 61 6e 63 65 73 74 6f 72 |r ediff-|ancestor|
|000050a0| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|000050b0| 66 65 72 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |fer get-|buffer b|
|000050c0| 75 66 66 65 72 2d 6e 61 | 6d 65 20 28 28 73 65 74 |uffer-na|me ((set|
|000050d0| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|000050e0| 66 65 72 29 29 20 62 75 | 66 66 65 72 2d 66 69 6c |fer)) bu|ffer-fil|
|000050f0| 65 2d 6e 61 6d 65 20 66 | 69 6c 65 20 66 69 6c 65 |e-name f|ile file|
|00005100| 2d 65 78 69 73 74 73 2d | 70 20 66 69 6c 65 2d 77 |-exists-|p file-w|
|00005110| 72 69 74 61 62 6c 65 2d | 70 20 66 69 6c 65 2d 77 |ritable-|p file-w|
|00005120| 72 69 74 61 62 6c 65 20 | 65 64 69 66 66 2d 74 6f |ritable |ediff-to|
|00005130| 67 67 6c 65 2d 72 65 61 | 64 2d 6f 6e 6c 79 2d 66 |ggle-rea|d-only-f|
|00005140| 75 6e 63 74 69 6f 6e 20 | 22 2c 76 22 20 74 6f 67 |unction |",v" tog|
|00005150| 67 6c 65 2d 72 65 61 64 | 2d 6f 6e 6c 79 20 6b 65 |gle-read|-only ke|
|00005160| 79 2d 62 69 6e 64 69 6e | 67 20 22 18 11 22 20 74 |y-bindin|g ".." t|
|00005170| 6f 67 67 6c 65 2d 72 6f | 2d 63 6d 64 20 62 75 66 |oggle-ro|-cmd buf|
|00005180| 66 65 72 2d 72 65 61 64 | 2d 6f 6e 6c 79 20 62 65 |fer-read|-only be|
|00005190| 65 70 20 31 20 79 2d 6f | 72 2d 6e 2d 70 20 66 6f |ep 1 y-o|r-n-p fo|
|000051a0| 72 6d 61 74 20 22 46 69 | 6c 65 20 25 73 20 69 73 |rmat "Fi|le %s is|
|000051b0| 20 75 6e 64 65 72 20 76 | 65 72 73 69 6f 6e 20 63 | under v|ersion c|
|000051c0| 6f 6e 74 72 6f 6c 2e 20 | 43 68 65 63 6b 20 69 74 |ontrol. |Check it|
|000051d0| 20 6f 75 74 3f 20 22 20 | 6e 69 6c 20 64 69 72 20 | out? " |nil dir |
|000051e0| 22 22 20 64 69 72 65 63 | 74 6f 72 79 2d 61 62 62 |"" direc|tory-abb|
|000051f0| 72 65 76 2d 61 6c 69 73 | 74 20 61 62 62 72 65 76 |rev-alis|t abbrev|
|00005200| 69 61 74 65 2d 66 69 6c | 65 2d 6e 61 6d 65 20 65 |iate-fil|e-name e|
|00005210| 64 69 66 66 2d 65 6d 61 | 63 73 2d 70 20 74 20 28 |diff-ema|cs-p t (|
|00005220| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00005230| 74 42 75 66 66 65 72 29 | 29 20 65 64 69 66 66 2d |tBuffer)|) ediff-|
|00005240| 63 68 61 6e 67 65 2d 73 | 61 76 65 64 2d 76 61 72 |change-s|aved-var|
|00005250| 69 61 62 6c 65 20 28 39 | 37 20 36 35 29 20 28 39 |iable (9|7 65) (9|
|00005260| 38 20 36 36 29 20 28 39 | 39 20 36 37 29 20 74 68 |8 66) (9|9 67) th|
|00005270| 69 73 2d 63 6f 6d 6d 61 | 6e 64 20 65 64 69 66 66 |is-comma|nd ediff|
|00005280| 2d 71 75 69 74 20 65 72 | 72 6f 72 20 22 59 6f 75 |-quit er|ror "You|
|00005290| 27 76 65 20 6b 69 6c 6c | 65 64 20 61 6e 20 65 73 |'ve kill|ed an es|
|000052a0| 73 65 6e 74 69 61 6c 20 | 45 64 69 66 66 20 62 75 |sential |Ediff bu|
|000052b0| 66 66 65 72 2d 2d 2d 50 | 6c 65 61 73 65 20 71 75 |ffer---P|lease qu|
|000052c0| 69 74 20 45 64 69 66 66 | 22 20 6d 65 73 73 61 67 |it Ediff|" messag|
|000052d0| 65 20 22 42 6f 79 2c 20 | 74 68 69 73 20 69 73 20 |e "Boy, |this is |
|000052e0| 72 69 73 6b 79 21 20 42 | 65 74 74 65 72 20 64 6f |risky! B|etter do|
|000052f0| 6e 27 74 20 63 68 61 6e | 67 65 20 74 68 69 73 20 |n't chan|ge this |
|00005300| 66 69 6c 65 2e 2e 2e 22 | 20 73 69 74 2d 66 6f 72 |file..."| sit-for|
|00005310| 20 33 20 73 74 72 69 6e | 67 2d 6d 61 74 63 68 20 | 3 strin|g-match |
|00005320| 22 74 6f 67 67 6c 65 2d | 72 65 61 64 2d 6f 6e 6c |"toggle-|read-onl|
|00005330| 79 22 20 73 79 6d 62 6f | 6c 2d 6e 61 6d 65 20 28 |y" symbo|l-name (|
|00005340| 28 63 6f 6d 6d 61 6e 64 | 2d 65 78 65 63 75 74 65 |(command|-execute|
|00005350| 20 74 6f 67 67 6c 65 2d | 72 6f 2d 63 6d 64 29 29 | toggle-|ro-cmd))|
|00005360| 20 22 44 6f 6e 27 74 20 | 6b 6e 6f 77 20 68 6f 77 | "Don't |know how|
|00005370| 20 74 6f 20 74 6f 67 67 | 6c 65 20 72 65 61 64 2d | to togg|le read-|
|00005380| 6f 6e 6c 79 20 69 6e 20 | 62 75 66 66 65 72 20 25 |only in |buffer %|
|00005390| 53 22 20 65 64 69 66 66 | 2d 74 6f 67 67 6c 65 2d |S" ediff|-toggle-|
|000053a0| 72 65 61 64 2d 6f 6e 6c | 79 20 22 57 61 72 6e 69 |read-onl|y "Warni|
|000053b0| 6e 67 3a 20 66 69 6c 65 | 20 25 73 20 69 73 20 72 |ng: file| %s is r|
|000053c0| 65 61 64 2d 6f 6e 6c 79 | 22 5d 20 37 20 22 5c 0a |ead-only|"] 7 "\.|
|000053d0| 54 6f 67 67 6c 65 20 72 | 65 61 64 2d 6f 6e 6c 79 |Toggle r|ead-only|
|000053e0| 20 69 6e 20 63 75 72 72 | 65 6e 74 20 62 75 66 66 | in curr|ent buff|
|000053f0| 65 72 2e 0a 49 66 20 62 | 75 66 66 65 72 20 69 73 |er..If b|uffer is|
|00005400| 20 75 6e 64 65 72 20 76 | 65 72 73 69 6f 6e 20 63 | under v|ersion c|
|00005410| 6f 6e 74 72 6f 6c 20 61 | 6e 64 20 6c 6f 63 6b 65 |ontrol a|nd locke|
|00005420| 64 2c 20 63 68 65 63 6b | 20 69 74 20 6f 75 74 20 |d, check| it out |
|00005430| 66 69 72 73 74 2e 0a 49 | 66 20 6f 70 74 69 6f 6e |first..I|f option|
|00005440| 61 6c 20 61 72 67 75 6d | 65 6e 74 20 42 55 46 20 |al argum|ent BUF |
|00005450| 69 73 20 73 70 65 63 69 | 66 69 65 64 2c 20 74 6f |is speci|fied, to|
|00005460| 67 67 6c 65 20 72 65 61 | 64 2d 6f 6e 6c 79 20 69 |ggle rea|d-only i|
|00005470| 6e 20 74 68 61 74 20 62 | 75 66 66 65 72 20 69 6e |n that b|uffer in|
|00005480| 73 74 65 61 64 0a 6f 66 | 20 74 68 65 20 63 75 72 |stead.of| the cur|
|00005490| 72 65 6e 74 20 62 75 66 | 66 65 72 2e 22 20 6e 69 |rent buf|fer." ni|
|000054a0| 6c 5d 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |l]).(byt|e-code "|
|000054b0| c0 c1 4d 88 c0 c2 4e c3 | 3e ac 85 c4 c5 c0 5c 22 |..M...N.|>.....\"|
|000054c0| 88 c6 c0 c2 c7 23 88 c8 | c9 4d 88 c8 c2 4e c3 3e |.....#..|.M...N.>|
|000054d0| ac 85 c4 c5 c8 5c 22 88 | c6 c8 c2 c7 23 87 22 20 |.....\".|....#." |
|000054e0| 5b 65 64 69 66 66 2d 66 | 69 6c 65 2d 63 68 65 63 |[ediff-f|ile-chec|
|000054f0| 6b 65 64 2d 6f 75 74 2d | 70 20 23 5b 28 66 69 6c |ked-out-|p #[(fil|
|00005500| 65 29 20 22 08 3b ad 8f | c1 08 21 ad 8a c2 08 21 |e) ".;..|..!....!|
|00005510| ad 85 c1 08 c3 50 21 87 | 22 20 5b 66 69 6c 65 20 |.....P!.|" [file |
|00005520| 66 69 6c 65 2d 65 78 69 | 73 74 73 2d 70 20 66 69 |file-exi|sts-p fi|
|00005530| 6c 65 2d 77 72 69 74 61 | 62 6c 65 2d 70 20 22 2c |le-writa|ble-p ",|
|00005540| 76 22 5d 20 33 5d 20 62 | 79 74 65 2d 6f 70 74 69 |v"] 3] b|yte-opti|
|00005550| 6d 69 7a 65 72 20 28 6e | 69 6c 20 62 79 74 65 2d |mizer (n|il byte-|
|00005560| 63 6f 6d 70 69 6c 65 2d | 69 6e 6c 69 6e 65 2d 65 |compile-|inline-e|
|00005570| 78 70 61 6e 64 29 20 65 | 72 72 6f 72 20 22 25 73 |xpand) e|rror "%s|
|00005580| 20 61 6c 72 65 61 64 79 | 20 68 61 73 20 61 20 62 | already| has a b|
|00005590| 79 74 65 2d 6f 70 74 69 | 6d 69 7a 65 72 2c 20 63 |yte-opti|mizer, c|
|000055a0| 61 6e 27 74 20 6d 61 6b | 65 20 69 74 20 69 6e 6c |an't mak|e it inl|
|000055b0| 69 6e 65 22 20 70 75 74 | 20 62 79 74 65 2d 63 6f |ine" put| byte-co|
|000055c0| 6d 70 69 6c 65 2d 69 6e | 6c 69 6e 65 2d 65 78 70 |mpile-in|line-exp|
|000055d0| 61 6e 64 20 65 64 69 66 | 66 2d 66 69 6c 65 2d 63 |and edif|f-file-c|
|000055e0| 68 65 63 6b 65 64 2d 69 | 6e 2d 70 20 23 5b 28 66 |hecked-i|n-p #[(f|
|000055f0| 69 6c 65 29 20 22 08 3b | ad 90 c1 08 21 ad 8b c2 |ile) ".;|....!...|
|00005600| 08 21 3f ad 85 c1 08 c3 | 50 21 87 22 20 5b 66 69 |.!?.....|P!." [fi|
|00005610| 6c 65 20 66 69 6c 65 2d | 65 78 69 73 74 73 2d 70 |le file-|exists-p|
|00005620| 20 66 69 6c 65 2d 77 72 | 69 74 61 62 6c 65 2d 70 | file-wr|itable-p|
|00005630| 20 22 2c 76 22 5d 20 33 | 5d 5d 20 34 29 0a 28 66 | ",v"] 3|]] 4).(f|
|00005640| 73 65 74 20 27 65 64 69 | 66 66 2d 73 77 61 70 2d |set 'edi|ff-swap-|
|00005650| 62 75 66 66 65 72 73 20 | 23 5b 6e 69 6c 20 22 c0 |buffers |#[nil ".|
|00005660| 09 21 83 5c 5c 01 c0 5c | 6e 21 83 5c 5c 01 0b 0c |.!.\\..\|n!.\\...|
|00005670| 0d 0e 06 0e 07 0e 08 0e | 09 3d ca 20 ad 89 ca 20 |........|.=. ... |
|00005680| cb 3e 3f ad 82 0e 0c 1e | 0d 1e 0e 1e 0f 1e 10 1e |.>?.....|........|
|00005690| 11 1e 12 1e 13 0e 14 ab | 94 d5 09 0e 16 5c 22 88 |........|.....\".|
|000056a0| d5 5c 6e 0b 5c 22 88 d5 | 0e 17 0e 18 5c 22 88 aa |.\n.\"..|....\"..|
|000056b0| 8b d5 09 0e 18 5c 22 88 | d5 5c 6e 0b 5c 22 88 0e |.....\".|.\n.\"..|
|000056c0| 14 ab 8d 0e 16 13 0e 18 | 16 16 0e 13 16 18 aa 87 |........|........|
|000056d0| 0e 18 13 0e 13 16 18 0e | 14 ab 8d 0e 19 14 0e 1a |........|........|
|000056e0| 16 19 0e 12 16 1a aa 87 | 0e 1a 14 0e 12 16 1a 0e |........|........|
|000056f0| 14 ab 8d 0e 1b 15 0e 1c | 16 1b 0e 11 16 1c aa 87 |........|........|
|00005700| 0e 1c 15 0e 11 16 1c 0e | 14 ab 9a 0e 1d 16 06 0e |........|........|
|00005710| 1e 16 1d 0e 10 16 1e 0e | 1f 16 07 0e 20 16 1f 0e |........|.... ...|
|00005720| 0f 16 20 aa 90 0e 1e 16 | 06 0e 10 16 1e 0e 20 16 |.. .....|...... .|
|00005730| 07 0e 0f 16 20 ca 20 ab | a0 ca 20 cb 3e ac 9a 0e |.... . .|.. .>...|
|00005740| 14 ab 8e 0e 21 16 0c 0e | 5c 22 16 21 0e 0d 16 5c |....!...|\".!...\|
|00005750| 22 aa 88 0e 5c 22 16 0c | 0e 0d 16 5c 22 0e 14 ab |"...\"..|...\"...|
|00005760| 8e e3 0e 09 38 0e 09 40 | 0e 09 41 40 45 aa 9a 0e |....8..@|..A@E...|
|00005770| 24 ab 8e 0e 09 41 40 0e | 09 40 e3 0e 09 38 45 aa |$....A@.|.@...8E.|
|00005780| 88 0e 09 41 40 0e 09 40 | 44 16 09 0e 14 ab 8e e3 |...A@..@|D.......|
|00005790| 0e 25 38 0e 25 40 0e 25 | 41 40 45 aa 9a 0e 24 ab |.%8.%@.%|A@E...$.|
|000057a0| 8e 0e 25 41 40 0e 25 40 | e3 0e 25 38 45 aa 88 0e |..%A@.%@|..%8E...|
|000057b0| 25 41 40 0e 25 40 44 16 | 25 0e 0e ab 86 0e 09 16 |%A@.%@D.|%.......|
|000057c0| 08 aa 84 0e 25 16 08 2e | 07 0e 24 ab 9d 0e 26 1e |....%...|..$...&.|
|000057d0| 27 e8 1e 29 e8 0e 2a 57 | ab 8f eb 0e 29 0e 27 5c |'..)..*W|....).'\|
|000057e0| 22 88 0e 29 54 89 16 29 | aa 6c 2a ec ed 21 87 22 |"..)T..)|.l*..!."|
|000057f0| 20 5b 77 69 6e 64 6f 77 | 2d 6c 69 76 65 2d 70 20 | [window|-live-p |
|00005800| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 41 20 65 |ediff-wi|ndow-A e|
|00005810| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 42 20 65 64 |diff-win|dow-B ed|
|00005820| 69 66 66 2d 62 75 66 66 | 65 72 2d 41 20 65 64 69 |iff-buff|er-A edi|
|00005830| 66 66 2d 62 75 66 66 65 | 72 2d 76 61 6c 75 65 73 |ff-buffe|r-values|
|00005840| 2d 6f 72 69 67 2d 41 20 | 65 64 69 66 66 2d 64 69 |-orig-A |ediff-di|
|00005850| 66 66 65 72 65 6e 63 65 | 2d 76 65 63 74 6f 72 2d |fference|-vector-|
|00005860| 41 20 65 64 69 66 66 2d | 72 65 67 65 78 70 2d 68 |A ediff-|regexp-h|
|00005870| 69 64 65 2d 41 20 65 64 | 69 66 66 2d 72 65 67 65 |ide-A ed|iff-rege|
|00005880| 78 70 2d 66 6f 63 75 73 | 2d 41 20 65 64 69 66 66 |xp-focus|-A ediff|
|00005890| 2d 76 69 73 69 62 6c 65 | 2d 62 6f 75 6e 64 73 20 |-visible|-bounds |
|000058a0| 65 64 69 66 66 2d 77 69 | 64 65 2d 62 6f 75 6e 64 |ediff-wi|de-bound|
|000058b0| 73 20 65 64 69 66 66 2d | 64 65 76 69 63 65 2d 74 |s ediff-|device-t|
|000058c0| 79 70 65 20 28 74 74 79 | 20 73 74 72 65 61 6d 29 |ype (tty| stream)|
|000058d0| 20 65 64 69 66 66 2d 63 | 75 72 72 65 6e 74 2d 64 | ediff-c|urrent-d|
|000058e0| 69 66 66 2d 6f 76 65 72 | 6c 61 79 2d 41 20 6f 76 |iff-over|lay-A ov|
|000058f0| 65 72 6c 61 79 20 77 69 | 64 65 2d 76 69 73 69 62 |erlay wi|de-visib|
|00005900| 69 6c 69 74 79 2d 70 20 | 66 6f 63 75 73 2d 72 65 |ility-p |focus-re|
|00005910| 67 65 78 70 20 68 69 64 | 65 2d 72 65 67 65 78 70 |gexp hid|e-regexp|
|00005920| 20 64 69 66 66 2d 76 65 | 63 20 76 61 6c 75 65 73 | diff-ve|c values|
|00005930| 20 62 75 66 20 65 64 69 | 66 66 2d 33 77 61 79 2d | buf edi|ff-3way-|
|00005940| 63 6f 6d 70 61 72 69 73 | 6f 6e 2d 6a 6f 62 20 73 |comparis|on-job s|
|00005950| 65 74 2d 77 69 6e 64 6f | 77 2d 62 75 66 66 65 72 |et-windo|w-buffer|
|00005960| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 2d 43 20 | ediff-b|uffer-C |
|00005970| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 43 20 65 |ediff-wi|ndow-C e|
|00005980| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 42 20 65 64 |diff-buf|fer-B ed|
|00005990| 69 66 66 2d 62 75 66 66 | 65 72 2d 76 61 6c 75 65 |iff-buff|er-value|
|000059a0| 73 2d 6f 72 69 67 2d 43 | 20 65 64 69 66 66 2d 62 |s-orig-C| ediff-b|
|000059b0| 75 66 66 65 72 2d 76 61 | 6c 75 65 73 2d 6f 72 69 |uffer-va|lues-ori|
|000059c0| 67 2d 42 20 65 64 69 66 | 66 2d 64 69 66 66 65 72 |g-B edif|f-differ|
|000059d0| 65 6e 63 65 2d 76 65 63 | 74 6f 72 2d 43 20 65 64 |ence-vec|tor-C ed|
|000059e0| 69 66 66 2d 64 69 66 66 | 65 72 65 6e 63 65 2d 76 |iff-diff|erence-v|
|000059f0| 65 63 74 6f 72 2d 42 20 | 65 64 69 66 66 2d 72 65 |ector-B |ediff-re|
|00005a00| 67 65 78 70 2d 68 69 64 | 65 2d 43 20 65 64 69 66 |gexp-hid|e-C edif|
|00005a10| 66 2d 72 65 67 65 78 70 | 2d 68 69 64 65 2d 42 20 |f-regexp|-hide-B |
|00005a20| 65 64 69 66 66 2d 72 65 | 67 65 78 70 2d 66 6f 63 |ediff-re|gexp-foc|
|00005a30| 75 73 2d 43 20 65 64 69 | 66 66 2d 72 65 67 65 78 |us-C edi|ff-regex|
|00005a40| 70 2d 66 6f 63 75 73 2d | 42 20 65 64 69 66 66 2d |p-focus-|B ediff-|
|00005a50| 63 75 72 72 65 6e 74 2d | 64 69 66 66 2d 6f 76 65 |current-|diff-ove|
|00005a60| 72 6c 61 79 2d 43 20 65 | 64 69 66 66 2d 63 75 72 |rlay-C e|diff-cur|
|00005a70| 72 65 6e 74 2d 64 69 66 | 66 2d 6f 76 65 72 6c 61 |rent-dif|f-overla|
|00005a80| 79 2d 42 20 32 20 65 64 | 69 66 66 2d 33 77 61 79 |y-B 2 ed|iff-3way|
|00005a90| 2d 6a 6f 62 20 65 64 69 | 66 66 2d 6e 61 72 72 6f |-job edi|ff-narro|
|00005aa0| 77 2d 62 6f 75 6e 64 73 | 20 65 64 69 66 66 2d 63 |w-bounds| ediff-c|
|00005ab0| 6f 6e 74 72 6f 6c 2d 62 | 75 66 66 65 72 20 63 74 |ontrol-b|uffer ct|
|00005ac0| 6c 2d 62 75 66 20 30 20 | 6e 20 65 64 69 66 66 2d |l-buf 0 |n ediff-|
|00005ad0| 6e 75 6d 62 65 72 2d 6f | 66 2d 64 69 66 66 65 72 |number-o|f-differ|
|00005ae0| 65 6e 63 65 73 20 65 64 | 69 66 66 2d 73 65 74 2d |ences ed|iff-set-|
|00005af0| 73 74 61 74 65 2d 6f 66 | 2d 64 69 66 66 2d 69 6e |state-of|-diff-in|
|00005b00| 2d 61 6c 6c 2d 62 75 66 | 66 65 72 73 20 65 64 69 |-all-buf|fers edi|
|00005b10| 66 66 2d 72 65 63 65 6e | 74 65 72 20 6e 6f 2d 72 |ff-recen|ter no-r|
|00005b20| 65 68 69 67 68 6c 69 67 | 68 74 5d 20 39 20 22 5c |ehighlig|ht] 9 "\|
|00005b30| 0a 52 6f 74 61 74 65 20 | 74 68 65 20 64 69 73 70 |.Rotate |the disp|
|00005b40| 6c 61 79 20 6f 66 20 62 | 75 66 66 65 72 73 20 41 |lay of b|uffers A|
|00005b50| 2c 20 42 2c 20 61 6e 64 | 20 43 2e 22 20 6e 69 6c |, B, and| C." nil|
|00005b60| 5d 29 0a 28 66 73 65 74 | 20 27 65 64 69 66 66 2d |]).(fset| 'ediff-|
|00005b70| 74 6f 67 67 6c 65 2d 77 | 69 64 65 2d 64 69 73 70 |toggle-w|ide-disp|
|00005b80| 6c 61 79 20 23 5b 6e 69 | 6c 20 22 c0 20 ac 8b c1 |lay #[ni|l ". ...|
|00005b90| c2 0b ab 83 c4 aa 81 c5 | 5c 22 88 c6 c7 21 88 0e |........|\"...!..|
|00005ba0| 08 1e 09 0e 5c 6e 3f 89 | 16 5c 6e ac be 70 1e 0b |....\n?.|.\n..p..|
|00005bb0| 0e 09 ab ab cc 0e 09 21 | ab a5 cd cc 0e 09 21 21 |.......!|......!!|
|00005bc0| ab 9d ce 8e 0e 09 71 88 | cf 0e 10 0e 11 5c 22 88 |......q.|.....\".|
|00005bd0| 0e 09 71 88 d2 16 11 d2 | 16 13 c6 c7 21 29 aa 89 |..q.....|....!)..|
|00005be0| 0e 14 d5 3d ae 83 c1 d6 | 21 29 aa b2 0e 17 20 88 |...=....|!).... .|
|00005bf0| 70 1e 0b 0e 09 ab 9d cc | 0e 09 21 ab 97 cd cc 0e |p.......|..!.....|
|00005c00| 09 21 21 ab 8f d8 8e 0e | 09 71 88 d2 16 13 c6 c7 |.!!.....|.q......|
|00005c10| 21 29 aa 89 0e 14 d5 3d | ae 83 c1 d6 21 29 29 87 |!).....=|....!)).|
|00005c20| 22 20 5b 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |" [ediff|-window-|
|00005c30| 64 69 73 70 6c 61 79 2d | 70 20 65 72 72 6f 72 20 |display-|p error |
|00005c40| 22 25 73 45 6d 61 63 73 | 20 69 73 20 6e 6f 74 20 |"%sEmacs| is not |
|00005c50| 72 75 6e 6e 69 6e 67 20 | 61 73 20 61 20 77 69 6e |running |as a win|
|00005c60| 64 6f 77 20 61 70 70 6c | 69 63 61 74 69 6f 6e 22 |dow appl|ication"|
|00005c70| 20 65 64 69 66 66 2d 65 | 6d 61 63 73 2d 70 20 22 | ediff-e|macs-p "|
|00005c80| 22 20 22 58 22 20 65 64 | 69 66 66 2d 72 65 63 65 |" "X" ed|iff-rece|
|00005c90| 6e 74 65 72 20 6e 6f 2d | 72 65 68 69 67 68 6c 69 |nter no-|rehighli|
|00005ca0| 67 68 74 20 65 64 69 66 | 66 2d 63 6f 6e 74 72 6f |ght edif|f-contro|
|00005cb0| 6c 2d 62 75 66 66 65 72 | 20 63 74 6c 2d 62 75 66 |l-buffer| ctl-buf|
|00005cc0| 20 65 64 69 66 66 2d 77 | 69 64 65 2d 64 69 73 70 | ediff-w|ide-disp|
|00005cd0| 6c 61 79 2d 70 20 53 74 | 61 72 74 42 75 66 66 65 |lay-p St|artBuffe|
|00005ce0| 72 20 67 65 74 2d 62 75 | 66 66 65 72 20 62 75 66 |r get-bu|ffer buf|
|00005cf0| 66 65 72 2d 6e 61 6d 65 | 20 28 28 73 65 74 2d 62 |fer-name| ((set-b|
|00005d00| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00005d10| 72 29 29 20 6d 6f 64 69 | 66 79 2d 66 72 61 6d 65 |r)) modi|fy-frame|
|00005d20| 2d 70 61 72 61 6d 65 74 | 65 72 73 20 65 64 69 66 |-paramet|ers edif|
|00005d30| 66 2d 77 69 64 65 2d 64 | 69 73 70 6c 61 79 2d 66 |f-wide-d|isplay-f|
|00005d40| 72 61 6d 65 20 65 64 69 | 66 66 2d 77 69 64 65 2d |rame edi|ff-wide-|
|00005d50| 64 69 73 70 6c 61 79 2d | 6f 72 69 67 2d 70 61 72 |display-|orig-par|
|00005d60| 61 6d 65 74 65 72 73 20 | 6e 69 6c 20 65 64 69 66 |ameters |nil edif|
|00005d70| 66 2d 77 69 6e 64 6f 77 | 2d 42 20 74 68 69 73 2d |f-window|-B this-|
|00005d80| 63 6f 6d 6d 61 6e 64 20 | 65 64 69 66 66 2d 71 75 |command |ediff-qu|
|00005d90| 69 74 20 22 59 6f 75 27 | 76 65 20 6b 69 6c 6c 65 |it "You'|ve kille|
|00005da0| 64 20 61 6e 20 65 73 73 | 65 6e 74 69 61 6c 20 45 |d an ess|ential E|
|00005db0| 64 69 66 66 20 62 75 66 | 66 65 72 2d 2d 2d 50 6c |diff buf|fer---Pl|
|00005dc0| 65 61 73 65 20 71 75 69 | 74 20 45 64 69 66 66 22 |ease qui|t Ediff"|
|00005dd0| 20 65 64 69 66 66 2d 6d | 61 6b 65 2d 77 69 64 65 | ediff-m|ake-wide|
|00005de0| 2d 64 69 73 70 6c 61 79 | 2d 66 75 6e 63 74 69 6f |-display|-functio|
|00005df0| 6e 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |n ((set-|buffer S|
|00005e00| 74 61 72 74 42 75 66 66 | 65 72 29 29 5d 20 34 20 |tartBuff|er))] 4 |
|00005e10| 22 5c 0a 54 6f 67 67 6c | 65 20 77 69 64 65 2f 72 |"\.Toggl|e wide/r|
|00005e20| 65 67 75 6c 61 72 20 64 | 69 73 70 6c 61 79 2e 0a |egular d|isplay..|
|00005e30| 54 68 69 73 20 69 73 20 | 65 73 70 65 63 69 61 6c |This is |especial|
|00005e40| 6c 79 20 75 73 65 66 75 | 6c 20 77 68 65 6e 20 63 |ly usefu|l when c|
|00005e50| 6f 6d 70 61 72 69 6e 67 | 20 62 75 66 66 65 72 73 |omparing| buffers|
|00005e60| 20 73 69 64 65 2d 62 79 | 2d 73 69 64 65 2e 22 20 | side-by|-side." |
|00005e70| 6e 69 6c 5d 29 0a 28 66 | 73 65 74 20 27 65 64 69 |nil]).(f|set 'edi|
|00005e80| 66 66 2d 74 6f 67 67 6c | 65 2d 6d 75 6c 74 69 66 |ff-toggl|e-multif|
|00005e90| 72 61 6d 65 20 23 5b 6e | 69 6c 20 22 c0 20 ac 8b |rame #[n|il ". ..|
|00005ea0| c1 c2 0b ab 83 c4 aa 81 | c5 5c 22 88 0e 06 c7 3d |........|.\"....=|
|00005eb0| ab 85 c8 16 06 aa 89 0e | 06 c8 3d ab 83 c7 16 06 |........|..=.....|
|00005ec0| c9 16 5c 6e cb cc 21 87 | 22 20 5b 65 64 69 66 66 |..\n..!.|" [ediff|
|00005ed0| 2d 77 69 6e 64 6f 77 2d | 64 69 73 70 6c 61 79 2d |-window-|display-|
|00005ee0| 70 20 65 72 72 6f 72 20 | 22 25 73 45 6d 61 63 73 |p error |"%sEmacs|
|00005ef0| 20 69 73 20 6e 6f 74 20 | 72 75 6e 6e 69 6e 67 20 | is not |running |
|00005f00| 61 73 20 61 20 77 69 6e | 64 6f 77 20 61 70 70 6c |as a win|dow appl|
|00005f10| 69 63 61 74 69 6f 6e 22 | 20 65 64 69 66 66 2d 65 |ication"| ediff-e|
|00005f20| 6d 61 63 73 2d 70 20 22 | 22 20 22 58 22 20 65 64 |macs-p "|" "X" ed|
|00005f30| 69 66 66 2d 77 69 6e 64 | 6f 77 2d 73 65 74 75 70 |iff-wind|ow-setup|
|00005f40| 2d 66 75 6e 63 74 69 6f | 6e 20 65 64 69 66 66 2d |-functio|n ediff-|
|00005f50| 73 65 74 75 70 2d 77 69 | 6e 64 6f 77 73 2d 6d 75 |setup-wi|ndows-mu|
|00005f60| 6c 74 69 66 72 61 6d 65 | 20 65 64 69 66 66 2d 73 |ltiframe| ediff-s|
|00005f70| 65 74 75 70 2d 77 69 6e | 64 6f 77 73 2d 70 6c 61 |etup-win|dows-pla|
|00005f80| 69 6e 20 6e 69 6c 20 65 | 64 69 66 66 2d 77 69 6e |in nil e|diff-win|
|00005f90| 64 6f 77 2d 42 20 65 64 | 69 66 66 2d 72 65 63 65 |dow-B ed|iff-rece|
|00005fa0| 6e 74 65 72 20 6e 6f 2d | 72 65 68 69 67 68 6c 69 |nter no-|rehighli|
|00005fb0| 67 68 74 5d 20 33 20 22 | 5c 0a 53 77 69 74 63 68 |ght] 3 "|\.Switch|
|00005fc0| 20 66 72 6f 6d 20 74 68 | 65 20 6d 75 6c 74 69 66 | from th|e multif|
|00005fd0| 72 61 6d 65 20 64 69 73 | 70 6c 61 79 20 74 6f 20 |rame dis|play to |
|00005fe0| 73 69 6e 67 6c 65 2d 66 | 72 61 6d 65 20 64 69 73 |single-f|rame dis|
|00005ff0| 70 6c 61 79 20 61 6e 64 | 20 62 61 63 6b 2e 0a 54 |play and| back..T|
|00006000| 68 69 73 20 69 73 20 70 | 72 69 6d 61 72 69 6c 79 |his is p|rimarily|
|00006010| 20 66 6f 72 20 64 65 62 | 75 67 67 69 6e 67 2c 20 | for deb|ugging, |
|00006020| 62 75 74 20 6f 6e 65 20 | 63 61 6e 20 75 73 65 20 |but one |can use |
|00006030| 69 74 20 66 6f 72 20 66 | 75 6e 2c 20 74 6f 6f 2e |it for f|un, too.|
|00006040| 22 20 6e 69 6c 5d 29 0a | 28 66 73 65 74 20 27 65 |" nil]).|(fset 'e|
|00006050| 64 69 66 66 2d 74 6f 67 | 67 6c 65 2d 73 68 6f 77 |diff-tog|gle-show|
|00006060| 2d 63 6c 61 73 68 65 73 | 2d 6f 6e 6c 79 20 23 5b |-clashes|-only #[|
|00006070| 6e 69 6c 20 22 08 ac 84 | c1 c2 21 88 0b 3f 89 13 |nil "...|..!..?..|
|00006080| ab 84 c4 c5 21 87 c4 c6 | 21 87 22 20 5b 65 64 69 |....!...|!." [edi|
|00006090| 66 66 2d 6d 65 72 67 65 | 2d 77 69 74 68 2d 61 6e |ff-merge|-with-an|
|000060a0| 63 65 73 74 6f 72 2d 6a | 6f 62 20 65 72 72 6f 72 |cestor-j|ob error|
|000060b0| 20 22 54 68 69 73 20 63 | 6f 6d 6d 61 6e 64 20 6d | "This c|ommand m|
|000060c0| 61 6b 65 73 20 73 65 6e | 73 65 20 6f 6e 6c 79 20 |akes sen|se only |
|000060d0| 77 68 65 6e 20 6d 65 72 | 67 69 6e 67 20 77 69 74 |when mer|ging wit|
|000060e0| 68 20 61 6e 20 61 6e 63 | 65 73 74 6f 72 22 20 65 |h an anc|estor" e|
|000060f0| 64 69 66 66 2d 73 68 6f | 77 2d 63 6c 61 73 68 65 |diff-sho|w-clashe|
|00006100| 73 2d 6f 6e 6c 79 20 6d | 65 73 73 61 67 65 20 22 |s-only m|essage "|
|00006110| 46 6f 63 75 73 20 6f 6e | 20 72 65 67 69 6f 6e 73 |Focus on| regions|
|00006120| 20 77 68 65 72 65 20 62 | 6f 74 68 20 62 75 66 66 | where b|oth buff|
|00006130| 65 72 73 20 64 69 66 66 | 65 72 20 66 72 6f 6d 20 |ers diff|er from |
|00006140| 74 68 65 20 61 6e 63 65 | 73 74 6f 72 22 20 22 43 |the ance|stor" "C|
|00006150| 61 6e 63 65 6c 69 6e 67 | 20 66 6f 63 75 73 20 6f |anceling| focus o|
|00006160| 6e 20 72 65 67 69 6f 6e | 73 20 77 68 65 72 65 20 |n region|s where |
|00006170| 63 68 61 6e 67 65 73 20 | 63 6c 61 73 68 22 5d 20 |changes |clash"] |
|00006180| 33 20 22 5c 0a 54 6f 67 | 67 6c 65 20 74 68 65 20 |3 "\.Tog|gle the |
|00006190| 6d 6f 64 65 20 77 68 65 | 72 65 20 6f 6e 6c 79 20 |mode whe|re only |
|000061a0| 74 68 65 20 72 65 67 69 | 6f 6e 73 20 77 68 65 72 |the regi|ons wher|
|000061b0| 65 20 62 6f 74 68 20 62 | 75 66 66 65 72 73 20 64 |e both b|uffers d|
|000061c0| 69 66 66 65 72 20 77 69 | 74 68 20 74 68 65 20 61 |iffer wi|th the a|
|000061d0| 6e 63 65 73 74 6f 72 20 | 61 72 65 20 73 68 6f 77 |ncestor |are show|
|000061e0| 6e 2e 22 20 6e 69 6c 5d | 29 0a 28 66 73 65 74 20 |n." nil]|).(fset |
|000061f0| 27 65 64 69 66 66 2d 74 | 6f 67 67 6c 65 2d 6e 61 |'ediff-t|oggle-na|
|00006200| 72 72 6f 77 2d 72 65 67 | 69 6f 6e 20 23 5b 6e 69 |rrow-reg|ion #[ni|
|00006210| 6c 20 22 08 09 3d ab 84 | c2 c3 21 88 0c 0d 3d ab |l "..=..|..!...=.|
|00006220| 85 0e 06 14 aa 82 0d 14 | c7 c8 21 87 22 20 5b 65 |........|..!." [e|
|00006230| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 41 20 65 64 |diff-buf|fer-A ed|
|00006240| 69 66 66 2d 62 75 66 66 | 65 72 2d 42 20 65 72 72 |iff-buff|er-B err|
|00006250| 6f 72 20 22 42 75 66 66 | 65 72 73 20 41 20 61 6e |or "Buff|ers A an|
|00006260| 64 20 42 20 61 72 65 20 | 74 68 65 20 73 61 6d 65 |d B are |the same|
|00006270| 2e 20 43 61 6e 27 74 20 | 6e 61 72 72 6f 77 20 74 |. Can't |narrow t|
|00006280| 6f 20 74 77 6f 20 64 69 | 66 66 65 72 65 6e 74 20 |o two di|fferent |
|00006290| 72 65 67 69 6f 6e 73 22 | 20 65 64 69 66 66 2d 76 |regions"| ediff-v|
|000062a0| 69 73 69 62 6c 65 2d 62 | 6f 75 6e 64 73 20 65 64 |isible-b|ounds ed|
|000062b0| 69 66 66 2d 77 69 64 65 | 2d 62 6f 75 6e 64 73 20 |iff-wide|-bounds |
|000062c0| 65 64 69 66 66 2d 6e 61 | 72 72 6f 77 2d 62 6f 75 |ediff-na|rrow-bou|
|000062d0| 6e 64 73 20 65 64 69 66 | 66 2d 72 65 63 65 6e 74 |nds edif|f-recent|
|000062e0| 65 72 20 6e 6f 2d 72 65 | 68 69 67 68 6c 69 67 68 |er no-re|highligh|
|000062f0| 74 5d 20 32 20 22 5c 0a | 54 6f 67 67 6c 65 20 6e |t] 2 "\.|Toggle n|
|00006300| 61 72 72 6f 77 69 6e 67 | 20 69 6e 20 62 75 66 66 |arrowing| in buff|
|00006310| 65 72 73 20 41 2c 20 42 | 2c 20 61 6e 64 20 43 2e |ers A, B|, and C.|
|00006320| 0a 55 73 65 64 20 69 6e | 20 65 64 69 66 66 2d 77 |.Used in| ediff-w|
|00006330| 69 6e 64 6f 77 73 2f 72 | 65 67 69 6f 6e 73 20 6f |indows/r|egions o|
|00006340| 6e 6c 79 2e 22 20 6e 69 | 6c 5d 29 0a 28 62 79 74 |nly." ni|l]).(byt|
|00006350| 65 2d 63 6f 64 65 20 22 | c0 c1 4d 88 c2 c3 4d 87 |e-code "|..M...M.|
|00006360| 22 20 5b 65 64 69 66 66 | 2d 76 69 73 69 62 6c 65 |" [ediff|-visible|
|00006370| 2d 72 65 67 69 6f 6e 20 | 23 5b 6e 69 6c 20 22 08 |-region |#[nil ".|
|00006380| 09 3d ae 88 08 5c 6e 3d | ae 83 5c 6e 09 3d 3f 85 |.=...\n=|..\n.=?.|
|00006390| 32 01 0b ac 82 0c 15 0d | 40 0d 41 40 c6 0d 38 1e |2.......|@.A@..8.|
|000063a0| 07 1e 08 1e 09 70 1e 5c | 6e 08 ab c8 cb 08 21 ab |.....p.\|n.....!.|
|000063b0| c3 cc cb 08 21 21 ab bc | cd 8e 08 71 88 0e 09 1e |....!!..|...q....|
|000063c0| 0e cf 0e 0e 21 ad 8e 0e | 10 ab 86 d1 0e 0e 21 aa |....!...|......!.|
|000063d0| 84 d2 0e 0e 21 29 0e 09 | 1e 0e cf 0e 0e 21 ad 8e |....!)..|.....!..|
|000063e0| 0e 10 ab 86 d3 0e 0e 21 | aa 84 d4 0e 0e 21 29 7d |.......!|.....!)}|
|000063f0| 88 29 aa 8a 0e 15 d6 3d | ac 84 d7 d8 21 88 29 70 |.).....=|....!.)p|
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
